nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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.
This commit is contained in:
Ricardo Wurmus 2015-03-23 10:15:28 +01:00
parent 3893c80a88
commit 18f3c3209d
1 changed files with 0 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
gnu/packages/java.scm
View File

@ -291,7 +291,6 @@ build process and its dependencies, whereas Make uses Makefile format.")
(let* ((gcjdir (assoc-ref %build-inputs "gcj")) (let* ((gcjdir (assoc-ref %build-inputs "gcj"))
(gcjlib (string-append gcjdir "/lib")) (gcjlib (string-append gcjdir "/lib"))
(antpath (string-append (getcwd) "/../apache-ant-1.9.4"))) (antpath (string-append (getcwd) "/../apache-ant-1.9.4")))
(setenv "CC" (which "gcc"))
(setenv "CPATH" (setenv "CPATH"
(string-append (assoc-ref %build-inputs "libxrender") (string-append (assoc-ref %build-inputs "libxrender")
"/include/X11/extensions" ":" "/include/X11/extensions" ":"
@ -309,8 +308,6 @@ build process and its dependencies, whereas Make uses Makefile format.")
(setenv "ALT_FREETYPE_LIB_PATH" (setenv "ALT_FREETYPE_LIB_PATH"
(string-append (assoc-ref %build-inputs "freetype") (string-append (assoc-ref %build-inputs "freetype")
"/lib")) "/lib"))
(setenv "LD_LIBRARY_PATH"
(string-append antpath "/lib" ":" gcjlib))
(setenv "PATH" (string-append antpath "/bin:" (setenv "PATH" (string-append antpath "/bin:"
(getenv "PATH"))))) (getenv "PATH")))))
(alist-cons-before (alist-cons-before