aboutsummaryrefslogtreecommitdiff
path: root/distro
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2012-11-16 00:23:06 +0100
committerLudovic Courtès <ludo@gnu.org>2012-11-16 00:23:06 +0100
commit01d45404f69025c757c1800e8b64fdd29a8134a6 (patch)
tree650e367a54d2193bf85ead0bde52bc5c0a4390bb /distro
parentec4d308a9e306e8784c324a2f8511e27c50f9dff (diff)
downloadguix-01d45404f69025c757c1800e8b64fdd29a8134a6.tar
guix-01d45404f69025c757c1800e8b64fdd29a8134a6.tar.gz
distro: Configure ld and GCC to not look under /usr & co.
This fixes impurities with non-chroot builds on LFS-style distros. * distro/packages/base.scm (binutils): Pass `--with-lib-path'. (gcc-4.7): Pass `--with-local-prefix'. * distro/packages/make-bootstrap.scm (%binutils-static): Pass `--with-lib-path'.
Diffstat (limited to 'distro')
-rw-r--r--distro/packages/base.scm11
-rw-r--r--distro/packages/make-bootstrap.scm2
2 files changed, 9 insertions, 4 deletions
diff --git a/distro/packages/base.scm b/distro/packages/base.scm
index ed33d61d35..4b176301d6 100644
--- a/distro/packages/base.scm
+++ b/distro/packages/base.scm
@@ -320,10 +320,12 @@ that it is possible to use Make to build and install the program.")
`(("patch/new-dtags" ,(search-patch "binutils-ld-new-dtags.patch"))))
(arguments
`(#:patches (list (assoc-ref %build-inputs "patch/new-dtags"))
+ #:configure-flags '(;; Add `-static-libgcc' to not retain a dependency
+ ;; on GCC when bootstrapping.
+ "LDFLAGS=-static-libgcc"
- ;; Add `-static-libgcc' to not retain a dependency on GCC when
- ;; bootstrapping.
- #:configure-flags '("LDFLAGS=-static-libgcc")))
+ ;; Don't search under /usr/lib & co.
+ "--with-lib-path=/no-ld-lib-path")))
(synopsis "GNU Binutils, tools for manipulating binaries (linker,
assembler, etc.)")
@@ -358,6 +360,9 @@ BFD (Binary File Descriptor) library, `gprof', `nm', `strip', etc.")
`("--enable-plugin"
"--enable-languages=c,c++"
"--disable-multilib"
+
+ "--with-local-prefix=/no-gcc-local-prefix"
+
,(let ((libc (assoc-ref %build-inputs "libc")))
(if libc
(string-append "--with-native-system-header-dir=" libc
diff --git a/distro/packages/make-bootstrap.scm b/distro/packages/make-bootstrap.scm
index 3bc6e6b542..10e3d92735 100644
--- a/distro/packages/make-bootstrap.scm
+++ b/distro/packages/make-bootstrap.scm
@@ -225,7 +225,7 @@
(package (inherit binutils)
(name "binutils-static")
(arguments
- `(#:configure-flags '("--disable-gold")
+ `(#:configure-flags '("--disable-gold" "--with-lib-path=/no-ld-lib-path")
#:strip-flags '("--strip-all")
#:phases (alist-cons-before
'configure 'all-static