aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRicardo Wurmus <ricardo.wurmus@mdc-berlin.de>2015-03-23 10:15:28 +0100
committerRicardo Wurmus <ricardo.wurmus@mdc-berlin.de>2015-03-23 10:17:36 +0100
commit18f3c3209d1daf16623e29fe396a7b2a01c269af (patch)
treee0a16c5d065365b4e8f8ba51646cbf31a152b2be
parent3893c80a8866f268e039d90658feb6e6dc68e0da (diff)
downloadguix-18f3c3209d1daf16623e29fe396a7b2a01c269af.tar
guix-18f3c3209d1daf16623e29fe396a7b2a01c269af.tar.gz
gnu: icedtea6: Do not set CC and LD_LIBRARY_PATH.
* gnu/packages/java.scm (icedtea6)[arguments]: Do not set CC and LD_LIBRARY_PATH variables.
-rw-r--r--gnu/packages/java.scm3
1 files changed, 0 insertions, 3 deletions
diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm
index 02972701b7..a1e35cc449 100644
--- a/gnu/packages/java.scm
+++ b/gnu/packages/java.scm
@@ -291,7 +291,6 @@ build process and its dependencies, whereas Make uses Makefile format.")
(let* ((gcjdir (assoc-ref %build-inputs "gcj"))
(gcjlib (string-append gcjdir "/lib"))
(antpath (string-append (getcwd) "/../apache-ant-1.9.4")))
- (setenv "CC" (which "gcc"))
(setenv "CPATH"
(string-append (assoc-ref %build-inputs "libxrender")
"/include/X11/extensions" ":"
@@ -309,8 +308,6 @@ build process and its dependencies, whereas Make uses Makefile format.")
(setenv "ALT_FREETYPE_LIB_PATH"
(string-append (assoc-ref %build-inputs "freetype")
"/lib"))
- (setenv "LD_LIBRARY_PATH"
- (string-append antpath "/lib" ":" gcjlib))
(setenv "PATH" (string-append antpath "/bin:"
(getenv "PATH")))))
(alist-cons-before