diff options
| author | Mark H Weaver <mhw@netris.org> | 2015-01-01 22:53:55 -0500 |
|---|---|---|
| committer | Mark H Weaver <mhw@netris.org> | 2015-01-07 12:33:38 -0500 |
| commit | 270b501ee2b1b4ea4003a60b5568fc4dcb09d9db (patch) | |
| tree | d28690df49f2937b13f44027eaf8ecd3ecff1dc7 /gnu/packages/make-bootstrap.scm | |
| parent | 84cbe39c5a21495647ab6528715c42e4c5b94e83 (diff) | |
| download | guix-270b501ee2b1b4ea4003a60b5568fc4dcb09d9db.tar guix-270b501ee2b1b4ea4003a60b5568fc4dcb09d9db.tar.gz | |
gnu: gcc-static: Remove -lgcc_s from GNU_USER_TARGET_LIB_SPEC.
* gnu/packages/make-bootstrap.scm (%gcc-static): Add 'remove-lgcc_s
phase.
* gnu/packages/gcc.scm (gcc-4.7): Add comment.
Diffstat (limited to 'gnu/packages/make-bootstrap.scm')
| -rw-r--r-- | gnu/packages/make-bootstrap.scm | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/gnu/packages/make-bootstrap.scm b/gnu/packages/make-bootstrap.scm index f6ef2e326a..88fad0e604 100644 --- a/gnu/packages/make-bootstrap.scm +++ b/gnu/packages/make-bootstrap.scm @@ -430,7 +430,19 @@ for `sh' in $PATH, and without nscd, and with static NSS modules." "--disable-libquadmath" "--disable-decimal-float") (remove (cut string-match "--(.*plugin|enable-languages)" <>) - ,flags)))))) + ,flags))) + ((#:phases phases) + `(alist-cons-after + 'pre-configure 'remove-lgcc_s + (lambda _ + ;; Remove the '-lgcc_s' added to GNU_USER_TARGET_LIB_SPEC in + ;; the 'pre-configure phase of our main gcc package, because + ;; that shared library is not present in this static gcc. See + ;; <https://lists.gnu.org/archive/html/guix-devel/2015-01/msg00008.html>. + (substitute* (find-files "gcc/config" + "^gnu-user.*\\.h$") + ((" -lgcc_s}}") "}}"))) + ,phases))))) (native-inputs (if (%current-target-system) `(;; When doing a Canadian cross, we need GMP/MPFR/MPC both |