summary refs log tree commit diff
diff options
context:
space:
mode:
-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>