rekado pushed a commit to branch master
in repository guix.

commit 6f27f3775e0bad87fb1d9bf5107f81d17d2dc630
Author: Ricardo Wurmus <[email protected]>
Date:   Tue Mar 10 14:00:55 2015 +0100

    gnu: icedtea6: patch hardcoded objcopy path.
    
    * gnu/packages/java.scm (icedtea6)[arguments]: patch Makefile to override
      DEF_OBJCOPY variable definition.
---
 gnu/packages/java.scm |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm
index 7f841f0..84ac822 100644
--- a/gnu/packages/java.scm
+++ b/gnu/packages/java.scm
@@ -227,7 +227,9 @@ build process and its dependencies, whereas Make uses 
Makefile format.")
                 (string-append "DEVTOOLS_PATH = " corebin))
                (("COMPILER_PATH *= */usr/bin/")
                 (string-append "COMPILER_PATH = "
-                               (assoc-ref %build-inputs "gcc") "/bin/")))
+                               (assoc-ref %build-inputs "gcc") "/bin/"))
+               (("DEF_OBJCOPY *=.*objcopy")
+                (string-append "DEF_OBJCOPY = " (which "objcopy"))))
 
              ;; fix hard-coded utility paths
              (substitute* '("openjdk/jdk/make/common/shared/Defs-utils.gmk"

Reply via email to