diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2014-02-25 10:55:26 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2014-02-25 10:56:34 +0100 |
| commit | 95700a2d7d09893fe16aadb406e93bf7164f7422 (patch) | |
| tree | 65c4e6f1178258857ea652f81cd00810cb1c8288 /configure.ac | |
| parent | fix OOXML validation error (diff) | |
| download | core-95700a2d7d09893fe16aadb406e93bf7164f7422.tar.gz core-95700a2d7d09893fe16aadb406e93bf7164f7422.zip | |
Drop CLANGBUILD in addition to CLANGDIR
...see
<http://lists.freedesktop.org/archives/libreoffice/2014-February/059654.html>
"Drop CLANGBUILD in addition to CLANGDIR?"
Change-Id: I8d68aa0f2298240c8e7265cab273c602f5b6881a
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/configure.ac b/configure.ac index c400d23112b9..c6da52bb78f3 100644 --- a/configure.ac +++ b/configure.ac @@ -5656,18 +5656,13 @@ if test "$COM_GCC_IS_CLANG" = "TRUE"; then if test -z "$CLANGDIR"; then CLANGDIR=/usr fi - dnl The build directory (different from CLANGDIR if using a Clang out- - dnl of-source build): - if test -z "$CLANGBUILD"; then - CLANGBUILD=/usr - fi AC_LANG_PUSH([C++]) save_CPPFLAGS=$CPPFLAGS save_CXX=$CXX # compiler plugins must be built with "native" bitness of clang # because they link against clang libraries CXX=`echo $CXX | sed -e s/-m64// -e s/-m32//` - CPPFLAGS="$CPPFLAGS -I$CLANGDIR/include -I$CLANGDIR/tools/clang/include -I$CLANGBUILD/include -I$CLANGBUILD/tools/clang/include -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -D__STDC_LIMIT_MACROS" + CPPFLAGS="$CPPFLAGS -I$CLANGDIR/include -I$CLANGDIR/tools/clang/include -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -D__STDC_LIMIT_MACROS" AC_CHECK_HEADER(clang/AST/RecursiveASTVisitor.h, [COMPILER_PLUGINS=TRUE], [ @@ -5689,7 +5684,6 @@ else fi AC_SUBST(COMPILER_PLUGINS) AC_SUBST(CLANGDIR) -AC_SUBST(CLANGBUILD) # Plugin to help linker. # Add something like LD_PLUGIN=/usr/lib64/LLVMgold.so to your autogen.input. |