diff options
| author | Lubos Lunak <l.lunak@suse.cz> | 2012-12-23 22:38:34 +0100 |
|---|---|---|
| committer | Lubos Lunak <l.lunak@suse.cz> | 2012-12-26 13:56:45 +0100 |
| commit | e1b11cc461423f4b8f2709bd83cc7c7014c3de1c (patch) | |
| tree | 2641b58aae7266063106f1651a675047f1f329bb /compilerplugins | |
| parent | 8c0cb89a4f00704223101c8a380da1ceb33d706a (diff) | |
config_clang.h
Diffstat (limited to 'compilerplugins')
| -rw-r--r-- | compilerplugins/Makefile-clang.mk | 2 | ||||
| -rw-r--r-- | compilerplugins/clang/sallogareas.cxx | 8 |
2 files changed, 4 insertions, 6 deletions
diff --git a/compilerplugins/Makefile-clang.mk b/compilerplugins/Makefile-clang.mk index c87338c36c6a..6031fe194f86 100644 --- a/compilerplugins/Makefile-clang.mk +++ b/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 diff --git a/compilerplugins/clang/sallogareas.cxx b/compilerplugins/clang/sallogareas.cxx index 10630aa3981c..4462413f7ced 100644 --- a/compilerplugins/clang/sallogareas.cxx +++ b/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; |