diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2012-09-12 00:07:12 +0200 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2012-09-12 00:07:12 +0200 |
| commit | dc0a9729dd82b4db1f82d95598ead512b29e1e3f (patch) | |
| tree | 5691162853549c7b5f22ba47f91bc19c901ed668 /distro | |
| parent | b289e9f9dd784e7fd1c83a6ce687d2b7d05ffb8c (diff) | |
| download | patches-dc0a9729dd82b4db1f82d95598ead512b29e1e3f.tar patches-dc0a9729dd82b4db1f82d95598ead512b29e1e3f.tar.gz | |
distro: gcc: Add a RUNPATH on libc.
* distro/base.scm (gcc-4.7): Remove unnecessary "libc" input.
Add `-rpath LIBC/lib' to `LIB_SPEC'.
Diffstat (limited to 'distro')
| -rw-r--r-- | distro/base.scm | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/distro/base.scm b/distro/base.scm index 6d05bb5e76..e9f1b63ad0 100644 --- a/distro/base.scm +++ b/distro/base.scm @@ -717,8 +717,7 @@ BFD (Binary File Descriptor) library, `gprof', `nm', `strip', etc.") (base32 "0vs0v89zzgkngkw2p8kdynyk7j8ky4wf6zyrg3rsschpl1pky28n")))) (build-system gnu-build-system) - (inputs `(("libc" ,(nixpkgs-derivation* "glibc")) - ("gmp" ,gmp) + (inputs `(("gmp" ,gmp) ("mpfr" ,mpfr) ("mpc" ,mpc))) ; TODO: libelf, ppl, cloog, zlib, etc. (arguments @@ -771,8 +770,9 @@ BFD (Binary File Descriptor) library, `gprof', `nm', `strip', etc.") "gcc/config/i386/gnu-user.h" "gcc/config/i386/gnu-user64.h") (("#define LIB_SPEC (.*)$" _ suffix) - (format #f "#define LIB_SPEC \"-L~a/lib -rpath=~a/lib64 -rpath=~a/lib \" ~a~%" - libc out out suffix)) + (format #f "#define LIB_SPEC \"-L~a/lib -rpath=~a/lib \ +-rpath=~a/lib64 -rpath=~a/lib \" ~a~%" + libc libc out out suffix)) (("([^ ]*)crt([^\\.])\\.o" _ prefix suffix) (string-append libc "/lib/" prefix "crt" suffix ".o")))) |