Skip to content
Snippets Groups Projects
Commit 21e583de authored by Ludovic Courtès's avatar Ludovic Courtès
Browse files

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".
parent 669b8639
No related branches found
No related tags found
No related merge requests found
...@@ -252,6 +252,13 @@ (define-public gcc-4.7 ...@@ -252,6 +252,13 @@ (define-public gcc-4.7
(("static char const sed_cmd_z\\[\\] =.*;") (("static char const sed_cmd_z\\[\\] =.*;")
"static char const sed_cmd_z[] = \"sed\";")) "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 ;; Move libstdc++*-gdb.py to the "lib" output to avoid a
;; circularity between "out" and "lib". (Note: ;; circularity between "out" and "lib". (Note:
;; --with-python-dir is useless because it imposes $(prefix) as ;; --with-python-dir is useless because it imposes $(prefix) as
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment