From 21e583def33ecf9e9bae3a18df875cd3380e14ec Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Thu, 23 Apr 2015 00:03:34 +0200
Subject: [PATCH] gnu: gcc: Add a RUNPATH to libstdc++.so so that it finds
libgcc_s.so.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Fixes <http://bugs.gnu.org/20358>.
Reported by å®‹æ–‡æ¦ <iyzsong@gmail.com>.
* gnu/packages/gcc.scm (gcc-4.7)[arguments]: Add 'substitute*' form for
"libstdc++-v3/src/Makefile.in".
---
gnu/packages/gcc.scm | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/gnu/packages/gcc.scm b/gnu/packages/gcc.scm
index cd6fc3b2fdc..442ea9874e6 100644
--- a/gnu/packages/gcc.scm
+++ b/gnu/packages/gcc.scm
@@ -252,6 +252,13 @@ (define-public gcc-4.7
(("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
--
GitLab