aboutsummaryrefslogtreecommitdiff
path: root/gnu
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2015-06-14 14:41:01 +0200
committerLudovic Courtès <ludo@gnu.org>2015-06-14 14:41:01 +0200
commitec2990716005b4b41bab6b707ada0206c1655be8 (patch)
tree0c1c811996a08e5e261cc69bd0006ad3e8796e85 /gnu
parentb5616bc33d43f9507ffb8ac87d1e2158752c42c3 (diff)
downloadguix-ec2990716005b4b41bab6b707ada0206c1655be8.tar
guix-ec2990716005b4b41bab6b707ada0206c1655be8.tar.gz
gnu: gcc: Build libsanitizer's bundled libbacktrace without -Werror.
* gnu/packages/gcc.scm (gcc-4.7)[arguments]: Also patch libsanitizer/libbacktrace/Makefile.in.
Diffstat (limited to 'gnu')
-rw-r--r--gnu/packages/gcc.scm8
1 files changed, 7 insertions, 1 deletions
diff --git a/gnu/packages/gcc.scm b/gnu/packages/gcc.scm
index 414f31cb3c..beb007e95b 100644
--- a/gnu/packages/gcc.scm
+++ b/gnu/packages/gcc.scm
@@ -246,7 +246,13 @@ where the OS part is overloaded to denote a specific ABI---into GCC
;; 2.21's stdlib-bsearch.h. Remove -Werror.
(substitute* "libbacktrace/configure"
(("WARN_FLAGS=(.*)-Werror" _ flags)
- (string-append "WARN_FLAGS=" flags))))
+ (string-append "WARN_FLAGS=" flags)))
+
+ (when (file-exists? "libsanitizer/libbacktrace")
+ ;; Same in libsanitizer's bundled copy (!) found in 4.9+.
+ (substitute* "libsanitizer/libbacktrace/Makefile.in"
+ (("-Werror")
+ ""))))
;; Add a RUNPATH to libstdc++.so so that it finds libgcc_s.
;; See <https://gcc.gnu.org/bugzilla/show_bug.cgi?id=32354>