summary | log | graphiclog1 | graphiclog2 | commit | commitdiff | tree | refs | edit | fork
raw | patch | inline | side by side (parent: 1fa0561)
m4/ax_detect_clang.m4: preserve clang specific CPPFLAGS across clang-cpp check
authorSven Verdoolaege <sven.verdoolaege@gmail.com>
Fri, 24 Mar 2023 17:29:53 +0000 (24 18:29 +0100)
committerSven Verdoolaege <sven.verdoolaege@gmail.com>
Sun, 26 Mar 2023 21:05:08 +0000 (26 23:05 +0200)
This will be needed in the next commit, to compile (and link)
a test program.
For simplicity, save and restore all modified flags together.

Signed-off-by: Sven Verdoolaege <sven.verdoolaege@gmail.com>
m4/ax_detect_clang.m4 patch | blob | blame | history

diff --git a/m4/ax_detect_clang.m4 b/m4/ax_detect_clang.m4
index 1c305ad..420d87b 100644 (file)
--- a/m4/ax_detect_clang.m4
+++ b/m4/ax_detect_clang.m4
@@ -75,6 +75,8 @@ CC="$SAVE_CC"
 AC_LANG_PUSH(C++)
 
 SAVE_CPPFLAGS="$CPPFLAGS"
+SAVE_LDFLAGS="$LDFLAGS"
+
 CPPFLAGS="$CLANG_CXXFLAGS -I$srcdir $CPPFLAGS"
 AC_CHECK_HEADER([clang/Basic/SourceLocation.h], [],
        [AC_MSG_ERROR([clang header file not found])])
@@ -233,9 +235,7 @@ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
 AC_CHECK_HEADER([llvm/Option/Arg.h],
        [AC_DEFINE([HAVE_LLVM_OPTION_ARG_H], [],
                   [Define if llvm/Option/Arg.h exists])])
-CPPFLAGS="$SAVE_CPPFLAGS"
 
-SAVE_LDFLAGS="$LDFLAGS"
 LDFLAGS="$CLANG_LDFLAGS $LDFLAGS"
 
 # Use single libclang-cpp shared library when available.
@@ -253,6 +253,7 @@ else
        CLANG_LIBS="-lclangFrontend -lclangSerialization $CLANG_LIBS"
 fi
 
+CPPFLAGS="$SAVE_CPPFLAGS"
 LDFLAGS="$SAVE_LDFLAGS"
 
 AC_LANG_POP
Integer set library