mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

AC_CHECK_HEADER uses both CXX and CXXCPP

Browse Source 
Because it does both a compile and a preprocessor check.

Change-Id: I2f144ea63ae1481822bb239127f0f5a934e22e73
Reviewed-on: https://gerrit.libreoffice.org/68971
Tested-by: Jenkins
Reviewed-by: Luboš Luňák <l.lunak@collabora.com>
This commit is contained in:
Luboš Luňák
2019-03-09 11:32:07 +01:00
parent a7bdd3eeb8
commit 05fbcb4768
1 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
configure.ac
View File

@@ -6887,9 +6887,11 @@ if test "$COM_IS_CLANG" = "TRUE"; then
AC_LANG_PUSH([C++]) AC_LANG_PUSH([C++])
save_CPPFLAGS=$CPPFLAGS save_CPPFLAGS=$CPPFLAGS
save_CXX=$CXX save_CXX=$CXX
save_CXXCPP=$CXXCPP
# compiler plugins must be built with "native" compiler that was used to build Clang itself: # compiler plugins must be built with "native" compiler that was used to build Clang itself:
: "${COMPILER_PLUGINS_CXX=g++ -std=c++11}" : "${COMPILER_PLUGINS_CXX=g++ -std=c++11}"
CXX=$COMPILER_PLUGINS_CXX CXX=$COMPILER_PLUGINS_CXX
CXXCPP="$COMPILER_PLUGINS_CXX -E"
CPPFLAGS="$CPPFLAGS -I$CLANGDIR/include -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -D__STDC_LIMIT_MACROS" CPPFLAGS="$CPPFLAGS -I$CLANGDIR/include -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -D__STDC_LIMIT_MACROS"
AC_CHECK_HEADER(clang/AST/RecursiveASTVisitor.h, AC_CHECK_HEADER(clang/AST/RecursiveASTVisitor.h,
[COMPILER_PLUGINS=TRUE], [COMPILER_PLUGINS=TRUE],
@@ -6902,6 +6904,7 @@ if test "$COM_IS_CLANG" = "TRUE"; then
fi fi
]) ])
CXX=$save_CXX CXX=$save_CXX
CXXCPP=$save_CXXCPP
CPPFLAGS=$save_CPPFLAGS CPPFLAGS=$save_CPPFLAGS
AC_LANG_POP([C++]) AC_LANG_POP([C++])
fi fi