config_clang.h

compilerplugins/Makefile-clang.mk

@@ -52,7 +52,7 @@ CLANGOBJS=
 define clangbuildsrc
 $(3): $(2) $(SRCDIR)/compilerplugins/Makefile-clang.mk $(CLANGOUTDIR)/clang-timestamp
 	@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) $(CLANGCXXFLAGS) $(CLANGDEFS) $(CLANGINCLUDES) -I$(BUILDDIR)/config $(2) -fPIC -c -o $(3) -MMD -MT $(3) -MP -MF $(CLANGOUTDIR)/$(1).d
 
 -include $(CLANGOUTDIR)/$(1).d
 

compilerplugins/clang/sallogareas.cxx

@@ -16,6 +16,8 @@
 
 #include <fstream>
 
+#include <config_clang.h>
+
 namespace loplugin
 {
 
@@ -110,11 +112,7 @@ void SalLogAreas::checkArea( StringRef area, SourceLocation location )
 
 void SalLogAreas::readLogAreas()
     {
-#define STRINGIFY2( s ) #s
-#define STRINGIFY( s ) STRINGIFY2( s )
-    ifstream is( STRINGIFY( SRCDIR ) "/sal/inc/sal/log-areas.dox" );
-#undef STRINGIFY
-#undef STRINGIFY2
+    ifstream is( SRCDIR "/sal/inc/sal/log-areas.dox" );
     while( is.good())
         {
         string line;

config/config_clang.h.in

+/*
+
+Settings related to Clang compiler plugins.
+
+*/
+
+#ifndef CONFIG_CLANG_H
+#define CONFIG_CLANG_H
+
+#undef SRCDIR
+
+#endif

configure.ac

@@ -106,6 +106,7 @@ AC_SUBST(SRC_ROOT)
 AC_SUBST(BUILDDIR)
 AC_SUBST(EXEEXT_FOR_BUILD)
 AC_SUBST(x_Cygwin)
+AC_DEFINE_UNQUOTED(SRCDIR,"$SRC_ROOT")
 
 if test "z$EUID" = "z0" -a "`uname -o 2>/dev/null`" = "Cygwin"; then
     AC_MSG_ERROR([You must build LibreOffice as a normal user - not using an administrative account])
@@ -4164,6 +4165,7 @@ if test "$cross_compiling" = "yes"; then
         config_host.mk.in \
         configure \
         Makefile.in \
+        config/config_clang.h.in \
         config/config_global.h.in \
         config/config_graphite.h.in \
         config/config_telepathy.h.in \
@@ -12353,6 +12355,7 @@ else
 fi
 
 AC_CONFIG_FILES([config_host.mk Makefile])
+AC_CONFIG_HEADERS([config/config_clang.h])
 AC_CONFIG_HEADERS([config/config_global.h])
 AC_CONFIG_HEADERS([config/config_graphite.h])
 AC_CONFIG_HEADERS([config/config_telepathy.h])