nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

gnu: make-bootstrap: Fix compilation of %gcc-static. 

* gnu/packages/make-bootstrap.scm (%gcc-static)[arguments]
  <#:configure-flags>: Add --disable-bootstrap
  --with-stage1-ldflags=-static.
  Remove #:make-flags.
This commit is contained in:
Ludovic Courtès 2014-06-12 23:27:25 +02:00
parent a49c57a793
commit 288a09ca91
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
gnu/packages/make-bootstrap.scm
View File

@ -405,6 +405,12 @@ for `sh' in $PATH, and without nscd, and with static NSS modules."
((#:implicit-inputs? _) #t) ((#:implicit-inputs? _) #t)
((#:configure-flags flags) ((#:configure-flags flags)
`(append (list `(append (list
;; We don't need a full bootstrap here.
"--disable-bootstrap"
;; Make sure '-static' is passed where it matters.
"--with-stage1-ldflags=-static"
"--disable-shared" "--disable-shared"
"--disable-plugin" "--disable-plugin"
"--enable-languages=c" "--enable-languages=c"
@ -417,11 +423,7 @@ for `sh' in $PATH, and without nscd, and with static NSS modules."
"--disable-libquadmath" "--disable-libquadmath"
"--disable-decimal-float") "--disable-decimal-float")
(remove (cut string-match "--(.*plugin|enable-languages)" <>) (remove (cut string-match "--(.*plugin|enable-languages)" <>)
,flags))) ,flags))))))
((#:make-flags flags)
(if (%current-target-system)
`(cons "LDFLAGS=-static" ,flags)
`(cons "BOOT_LDFLAGS=-static" ,flags))))))
(native-inputs (native-inputs
(if (%current-target-system) (if (%current-target-system)
`(;; When doing a Canadian cross, we need GMP/MPFR/MPC both `(;; When doing a Canadian cross, we need GMP/MPFR/MPC both