[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
04/08: gnu: gcc-static: Remove -lgcc_s from GNU_USER_TARGET_LIB_SPEC.
From: |
Mark H. Weaver |
Subject: |
04/08: gnu: gcc-static: Remove -lgcc_s from GNU_USER_TARGET_LIB_SPEC. |
Date: |
Fri, 02 Jan 2015 04:02:20 +0000 |
mhw pushed a commit to branch wip-armhf
in repository guix.
commit 5336e4c741917953789ba1f3a9c3af7102790dcf
Author: Mark H Weaver <address@hidden>
Date: Thu Jan 1 22:53:55 2015 -0500
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.
---
gnu/packages/gcc.scm | 5 +++++
gnu/packages/make-bootstrap.scm | 14 +++++++++++++-
2 files changed, 18 insertions(+), 1 deletions(-)
diff --git a/gnu/packages/gcc.scm b/gnu/packages/gcc.scm
index e795f97..d8fd885 100644
--- a/gnu/packages/gcc.scm
+++ b/gnu/packages/gcc.scm
@@ -197,6 +197,11 @@ where the OS part is overloaded to denote a specific
ABI---into GCC
;; libgcc_s.so when pthread_cancel support is needed, but
;; having it in the application's RUNPATH isn't enough; see
;;
<http://sourceware.org/ml/libc-help/2013-11/msg00023.html>.)
+ ;;
+ ;; NOTE: The '-lgcc_s' added below needs to be removed in a
+ ;; later phase of %gcc-static. If you change the string
+ ;; below, make sure to update the relevant code in
+ ;; %gcc-static package as needed.
(format #f "#define GNU_USER_TARGET_LIB_SPEC \
\"-L~a/lib %{!static:-rpath=~a/lib %{!static-libgcc:-rpath=~a/lib64
-rpath=~a/lib -lgcc_s}} \" ~a"
libc libc libdir libdir suffix))
diff --git a/gnu/packages/make-bootstrap.scm b/gnu/packages/make-bootstrap.scm
index f6ef2e3..88fad0e 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
- branch wip-armhf created (now 8e12927), Mark H. Weaver, 2015/01/01
- 02/08: gnu: bootstrap: Fix egrep and fgrep after unpacking bootstrap binaries., Mark H. Weaver, 2015/01/01
- 01/08: gnu: bootstrap: Add support for snippets to 'package-from-tarball'., Mark H. Weaver, 2015/01/01
- 03/08: Move 'nix-system->gnu-triplet' to (guix utils) and export it., Mark H. Weaver, 2015/01/01
- 05/08: gnu: gcc: Use 'gcc-configure-flags-for-triplet' for native builds., Mark H. Weaver, 2015/01/01
- 04/08: gnu: gcc-static: Remove -lgcc_s from GNU_USER_TARGET_LIB_SPEC.,
Mark H. Weaver <=
- 06/08: gnu: gmp: Apply fixes for armhf., Mark H. Weaver, 2015/01/01
- 07/08: gnu: guile: Apply fixes for arm., Mark H. Weaver, 2015/01/01
- 08/08: PRELIMINARY: gnu: Add support for 'armhf-linux' system., Mark H. Weaver, 2015/01/01