~ruther/guix-local: gnu: gcc: Add a RUNPATH to libstdc++.so so that it finds libgcc_s.so.

21e583def33ecf9e9bae3a18df875cd3380e14ec — Ludovic Courtès 11 years ago 669b863

gnu: gcc: Add a RUNPATH to libstdc++.so so that it finds libgcc_s.so.

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".

patch browse .tar.gz

1 files changed, 7 insertions(+), 0 deletions(-)

M gnu/packages/gcc.scm

M gnu/packages/gcc.scm => gnu/packages/gcc.scm +7 -0

@@ 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