me/guix
Archived
1
0
Fork 0
Code Activity

distro: gcc: Don't add a RUNPATH to GCC when using `-static-libgcc'.

Browse source 
* distro/packages/base.scm (gcc-4.7)[LIB_SPEC]: Add a `-rpath' to GCC
  only when !static and !static-libgcc.
This commit is contained in:
Ludovic Courtès 2012-11-05 22:25:52 +01:00
parent 4500581a7c
commit bca114d528
1 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
distro/packages/base.scm
View file

@ -400,8 +400,11 @@ BFD (Binary File Descriptor) library, `gprof', `nm', `strip', etc.")
(substitute* (find-files "gcc/config" (substitute* (find-files "gcc/config"
"^(gnu-user(64)?|linux-elf)\\.h$") "^(gnu-user(64)?|linux-elf)\\.h$")
(("#define LIB_SPEC (.*)$" _ suffix) (("#define LIB_SPEC (.*)$" _ suffix)
(format #f "#define LIB_SPEC \"-L~a/lib -rpath=~a/lib \ ;; Note that with this "lib" spec, we may still add a
-rpath=~a/lib64 -rpath=~a/lib \" ~a~%" ;; RUNPATH to GCC even when `libgcc_s' is not NEEDED.
;; There's not much that can be done to avoid it, though.
(format #f "#define LIB_SPEC \"-L~a/lib %{!static:-rpath=~a/lib \
%{!static-libgcc:-rpath=~a/lib64 -rpath=~a/lib}} \" ~a~%"
libc libc out out suffix)) libc libc out out suffix))
(("#define STARTFILE_SPEC.*$" line) (("#define STARTFILE_SPEC.*$" line)
(format #f "#define STANDARD_STARTFILE_PREFIX_1 \"~a/lib\" (format #f "#define STANDARD_STARTFILE_PREFIX_1 \"~a/lib\"