guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

02/02: gnu: gcc: Build libsanitizer's bundled libbacktrace without -Werr


From: Ludovic Courtès
Subject: 02/02: gnu: gcc: Build libsanitizer's bundled libbacktrace without -Werror.
Date: Sun, 14 Jun 2015 12:46:59 +0000

civodul pushed a commit to branch core-updates
in repository guix.

commit ec2990716005b4b41bab6b707ada0206c1655be8
Author: Ludovic Courtès <address@hidden>
Date:   Sun Jun 14 14:41:01 2015 +0200

    gnu: gcc: Build libsanitizer's bundled libbacktrace without -Werror.
    
    * gnu/packages/gcc.scm (gcc-4.7)[arguments]: Also patch
      libsanitizer/libbacktrace/Makefile.in.
---
 gnu/packages/gcc.scm |    8 +++++++-
 1 files changed, 7 insertions(+), 1 deletions(-)

diff --git a/gnu/packages/gcc.scm b/gnu/packages/gcc.scm
index 414f31c..beb007e 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>



reply via email to

[Prev in Thread] Current Thread [Next in Thread]