summaryrefslogtreecommitdiff
path: root/gnu/packages/java.scm
diff options
context:
space:
mode:
authorRicardo Wurmus <ricardo.wurmus@mdc-berlin.de>2015-03-10 14:00:55 +0100
committerRicardo Wurmus <ricardo.wurmus@mdc-berlin.de>2015-03-23 10:17:35 +0100
commit6f27f3775e0bad87fb1d9bf5107f81d17d2dc630 (patch)
treea8381bfc08b91111b5c2e0055ab3ec8fe075f4c0 /gnu/packages/java.scm
parentf9e62ad221a9f059f78b4f2800d48cf893de10dd (diff)
downloadpatches-6f27f3775e0bad87fb1d9bf5107f81d17d2dc630.tar
patches-6f27f3775e0bad87fb1d9bf5107f81d17d2dc630.tar.gz
gnu: icedtea6: patch hardcoded objcopy path.
* gnu/packages/java.scm (icedtea6)[arguments]: patch Makefile to override DEF_OBJCOPY variable definition.
Diffstat (limited to 'gnu/packages/java.scm')
-rw-r--r--gnu/packages/java.scm4
1 files changed, 3 insertions, 1 deletions
diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm
index 7f841f090b..84ac822d9f 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"