diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2012-09-01 01:14:31 +0200 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2012-09-01 01:14:31 +0200 |
| commit | dc4e02572ec8726957402c1b0c2c6d37e2589af7 (patch) | |
| tree | 5e72ae07cf3fffbb2a3bbfc1bb385aef0ed7c1f9 /distro | |
| parent | f1f100b297fd0bf1fad4a1dc1b2764c6e85901db (diff) | |
| download | guix-patches-dc4e02572ec8726957402c1b0c2c6d37e2589af7.tar guix-patches-dc4e02572ec8726957402c1b0c2c6d37e2589af7.tar.gz | |
build-system/gnu: Add `path-exclusions' parameter.
* guix/build/gnu-build-system.scm (set-paths): Add new `path-exclusions'
parameter; honor it.
* guix/build-system/gnu.scm (gnu-build): New `path-exclusions' keyword
parameter; pass it to BUILDER.
* distro/base.scm (gcc-4.7): Exclude "libc" from $LIBRARY_PATH.
Diffstat (limited to 'distro')
| -rw-r--r-- | distro/base.scm | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/distro/base.scm b/distro/base.scm index 44ee059748..949cb571b1 100644 --- a/distro/base.scm +++ b/distro/base.scm @@ -605,6 +605,15 @@ BFD (Binary File Descriptor) library, `gprof', `nm', `strip', etc.") "-Wl," libc "/lib/ld-linux-x86-64.so.2") ,(string-append "BOOT_CFLAGS=-O2 " ,(if stripped? "-g0" "-g")))) + + ;; Exclude libc from $LIBRARY_PATH since the compiler being used + ;; should know whether its libc is, and to avoid linking build tools + ;; like `genhooks' against the wrong libc (for instance, when + ;; building a gcc-for-glibc-2.16 with a gcc-for-glibc-2.13, + ;; `genhooks' could end up being linked with glibc-2.16 but using + ;; crt*.o from glibc-2.13.) + #:path-exclusions '(("LIBRARY_PATH" "libc")) + #:tests? #f #:phases (alist-cons-before |