Kaydet (Commit) 9cabab00 authored tarafından Stephan Bergmann's avatar Stephan Bergmann

CLANGPLUGIN_CPPFLAGS for building plugin for Clang in nonstandard location

(i.e., configure with CLANGPLUGIN_CPPFLAGS=-I.../clang-installation/include
-I.../clang-build/tools/clang/include)

Change-Id: Ic6d2973629103f71c32f44ebba2ac70d137d18e7
üst d72f3d53
...@@ -56,7 +56,7 @@ CLANGOBJS= ...@@ -56,7 +56,7 @@ CLANGOBJS=
define clangbuildsrc define clangbuildsrc
$(3): $(2) $(SRCDIR)/compilerplugins/Makefile-clang.mk $(CLANGOUTDIR)/clang-timestamp $(3): $(2) $(SRCDIR)/compilerplugins/Makefile-clang.mk $(CLANGOUTDIR)/clang-timestamp
@echo [build CXX] $(subst $(SRCDIR)/,,$(2)) @echo [build CXX] $(subst $(SRCDIR)/,,$(2))
$(CXX) $(CLANGCXXFLAGS) $(CLANGDEFS) $(CLANGINCLUDES) -DSRCDIR=$(SRCDIR) $(2) -fPIC -c -o $(3) -MMD -MT $(3) -MP -MF $(CLANGOUTDIR)/$(1).d $(CXX) $(CLANGPLUGIN_CPPFLAGS) $(CLANGCXXFLAGS) $(CLANGDEFS) $(CLANGINCLUDES) -DSRCDIR=$(SRCDIR) $(2) -fPIC -c -o $(3) -MMD -MT $(3) -MP -MF $(CLANGOUTDIR)/$(1).d
-include $(CLANGOUTDIR)/$(1).d -include $(CLANGOUTDIR)/$(1).d
......
...@@ -59,6 +59,7 @@ ifneq ($(strip @CFLAGS@),) ...@@ -59,6 +59,7 @@ ifneq ($(strip @CFLAGS@),)
export CFLAGS=@CFLAGS@ export CFLAGS=@CFLAGS@
endif endif
export CHECK_PARALLELISM=@CHECK_PARALLELISM@ export CHECK_PARALLELISM=@CHECK_PARALLELISM@
export CLANGPLUGIN_CPPFLAGS=@CLANGPLUGIN_CPPFLAGS@
export CLASSPATH=@CLASSPATH@ export CLASSPATH=@CLASSPATH@
export CLUCENE_CFLAGS=@CLUCENE_CFLAGS@ export CLUCENE_CFLAGS=@CLUCENE_CFLAGS@
export CLUCENE_LIBS=@CLUCENE_LIBS@ export CLUCENE_LIBS=@CLUCENE_LIBS@
......
...@@ -5102,7 +5102,7 @@ if test "$COM_GCC_IS_CLANG" = "TRUE"; then ...@@ -5102,7 +5102,7 @@ if test "$COM_GCC_IS_CLANG" = "TRUE"; then
if test "$compiler_plugins" != "no"; then if test "$compiler_plugins" != "no"; then
AC_LANG_PUSH([C++]) AC_LANG_PUSH([C++])
save_CPPFLAGS=$CPPFLAGS save_CPPFLAGS=$CPPFLAGS
CPPFLAGS="$CPPFLAGS -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -D__STDC_LIMIT_MACROS" CPPFLAGS="$CPPFLAGS $CLANGPLUGIN_CPPFLAGS -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],
[ [
...@@ -5122,6 +5122,7 @@ else ...@@ -5122,6 +5122,7 @@ else
fi fi
fi fi
AC_SUBST(COMPILER_PLUGINS) AC_SUBST(COMPILER_PLUGINS)
AC_SUBST(CLANGPLUGIN_CPPFLAGS)
dnl =================================================================== dnl ===================================================================
dnl Set the MinGW sys-root dnl Set the MinGW sys-root
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment