Browse Source

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'.
gn-latest-20200428
Ludovic Courtès 9 years ago
parent
commit
01d45404f6
2 changed files with 9 additions and 4 deletions
  1. +8
    -3
      distro/packages/base.scm
  2. +1
    -1
      distro/packages/make-bootstrap.scm

+ 8
- 3
distro/packages/base.scm View File

@ -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


+ 1
- 1
distro/packages/make-bootstrap.scm View File

@ -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


Loading…
Cancel
Save