[Libreoffice-commits] core.git: configure.ac

Stephan Bergmann sbergman at redhat.com
Mon Mar 16 03:14:22 PDT 2015


 configure.ac |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit d44240ec532d2537575eadd043407b750761c373
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Mon Mar 16 11:11:28 2015 +0100

    Adapt configure.ac check to new Clang -fno-sanitize-recover=... syntax
    
    ...in Clang trunk towards 3.7 (ugly to come up with a standards-conforming sed
    BRE, though)
    
    Change-Id: I82196433ad153ae29b92ab15e58d6806ec4ccf26

diff --git a/configure.ac b/configure.ac
index e8d4fe8..49ad20a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -11203,7 +11203,8 @@ int main(int argc, char **argv) {
             #               ^~~~~~~~~~~~~~~~~~~~~~~
             #               vptr for 'QObjectPrivate'
             save_CXX=$CXX
-            CXX=$(printf %s "$CXX" | sed -e s/-fno-sanitize-recover//)
+            CXX=$(printf %s "$CXX"
+                | sed -e s/-fno-sanitize-recover\(=[0-9A-Za-z,_-]*\)*//)
             save_CXXFLAGS=$CXXFLAGS
             CXXFLAGS="$CXXFLAGS $KDE4_CFLAGS"
             save_LIBS=$LIBS


More information about the Libreoffice-commits mailing list