rekado pushed a commit to branch master
in repository guix.
commit 18f3c3209d1daf16623e29fe396a7b2a01c269af
Author: Ricardo Wurmus <[email protected]>
Date: Mon Mar 23 10:15:28 2015 +0100
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.
---
gnu/packages/java.scm | 3 ---
1 files changed, 0 insertions(+), 3 deletions(-)
diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm
index 0297270..a1e35cc 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
