[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
02/03: gnu: gcc: Add a RUNPATH to libstdc++.so so that it finds libgcc_s
From: |
Ludovic Courtès |
Subject: |
02/03: gnu: gcc: Add a RUNPATH to libstdc++.so so that it finds libgcc_s.so. |
Date: |
Wed, 22 Apr 2015 22:07:06 +0000 |
civodul pushed a commit to branch core-updates
in repository guix.
commit 21e583def33ecf9e9bae3a18df875cd3380e14ec
Author: Ludovic Courtès <address@hidden>
Date: Thu Apr 23 00:03:34 2015 +0200
gnu: gcc: Add a RUNPATH to libstdc++.so so that it finds libgcc_s.so.
Fixes <http://bugs.gnu.org/20358>.
Reported by å®‹æ–‡æ¦ <address@hidden>.
* gnu/packages/gcc.scm (gcc-4.7)[arguments]: Add 'substitute*' form for
"libstdc++-v3/src/Makefile.in".
---
gnu/packages/gcc.scm | 7 +++++++
1 files changed, 7 insertions(+), 0 deletions(-)
diff --git a/gnu/packages/gcc.scm b/gnu/packages/gcc.scm
index cd6fc3b..442ea98 100644
--- a/gnu/packages/gcc.scm
+++ b/gnu/packages/gcc.scm
@@ -252,6 +252,13 @@ where the OS part is overloaded to denote a specific
ABI---into GCC
(("static char const sed_cmd_z\\[\\] =.*;")
"static char const sed_cmd_z[] = \"sed\";"))
+ ;; Add a RUNPATH to libstdc++.so so that it finds libgcc_s.
+ ;; See <https://gcc.gnu.org/bugzilla/show_bug.cgi?id=32354>
+ ;; and <http://bugs.gnu.org/20358>.
+ (substitute* "libstdc++-v3/src/Makefile.in"
+ (("^OPT_LDFLAGS = ")
+ "OPT_LDFLAGS = -Wl,-rpath=$(libdir) "))
+
;; Move libstdc++*-gdb.py to the "lib" output to avoid a
;; circularity between "out" and "lib". (Note:
;; --with-python-dir is useless because it imposes $(prefix) as