diff options
| author | Luboš Luňák <l.lunak@suse.cz> | 2012-12-11 15:45:16 +0100 |
|---|---|---|
| committer | Luboš Luňák <l.lunak@suse.cz> | 2012-12-11 15:45:16 +0100 |
| commit | 2ac26dc83f2ce9c2b41f9d9b33dd4c0cdd8d1272 (patch) | |
| tree | 85dfae491553cbdf58554f6fc6ddb2df54190bd5 | |
| parent | c8c056fd203bc60bedb55d45bd8ca81b168391d8 (diff) | |
adjust clang plugins for srcdir != builddir
Change-Id: Ie4c934b52c4b010703e91f84b83e1fe590b5d187
| -rw-r--r-- | compilerplugins/Makefile-clang.mk | 4 | ||||
| -rw-r--r-- | solenv/gbuild/platform/com_GCC_defs.mk | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/compilerplugins/Makefile-clang.mk b/compilerplugins/Makefile-clang.mk index 4d405e9bc5d2..c87338c36c6a 100644 --- a/compilerplugins/Makefile-clang.mk +++ b/compilerplugins/Makefile-clang.mk @@ -37,7 +37,7 @@ CLANGINCLUDES=-I$(CLANGDIR)/include -I$(CLANGDIR)/tools/clang/include -I$(CLANGB CLANGINDIR=$(SRCDIR)/compilerplugins/clang # Cannot use $(WORKDIR), the plugin should survive even 'make clean', otherwise the rebuilt # plugin will cause cache misses with ccache. -CLANGOUTDIR=$(SRCDIR)/compilerplugins/obj +CLANGOUTDIR=$(BUILDDIR)/compilerplugins/obj compilerplugins: $(CLANGOUTDIR) $(CLANGOUTDIR)/plugin.so @@ -63,7 +63,7 @@ endef $(foreach src, $(CLANGSRC), $(eval $(call clangbuildsrc,$(src),$(CLANGINDIR)/$(src),$(CLANGOUTDIR)/$(src:.cxx=.o)))) $(CLANGOUTDIR)/plugin.so: $(CLANGOBJS) - @echo [build LNK] $(subst $(SRCDIR)/,,$@) + @echo [build LNK] $(subst $(BUILDDIR)/,,$@) $(CXX) -shared $(CLANGOBJS) -o $@ # Clang most probably doesn't maintain binary compatibility, so rebuild when clang changes. diff --git a/solenv/gbuild/platform/com_GCC_defs.mk b/solenv/gbuild/platform/com_GCC_defs.mk index cc2a606ea85b..3eca80eaa2a6 100644 --- a/solenv/gbuild/platform/com_GCC_defs.mk +++ b/solenv/gbuild/platform/com_GCC_defs.mk @@ -161,9 +161,9 @@ gb_LinkTarget_INCLUDE :=\ ifeq ($(COM_GCC_IS_CLANG),TRUE) ifeq ($(COMPILER_PLUGIN_TOOL),) -gb_COMPILER_PLUGINS := -Xclang -load -Xclang $(SRCDIR)/compilerplugins/obj/plugin.so -Xclang -add-plugin -Xclang loplugin +gb_COMPILER_PLUGINS := -Xclang -load -Xclang $(BUILDDIR)/compilerplugins/obj/plugin.so -Xclang -add-plugin -Xclang loplugin else -gb_COMPILER_PLUGINS := -Xclang -load -Xclang $(SRCDIR)/compilerplugins/obj/plugin.so -Xclang -plugin -Xclang loplugin -Xclang -plugin-arg-loplugin -Xclang $(COMPILER_PLUGIN_TOOL) +gb_COMPILER_PLUGINS := -Xclang -load -Xclang $(BUILDDIR)/compilerplugins/obj/plugin.so -Xclang -plugin -Xclang loplugin -Xclang -plugin-arg-loplugin -Xclang $(COMPILER_PLUGIN_TOOL) endif # extra EF variable to make the command line shorter (just like is done with $(SRCDIR) etc.) gb_COMPILER_PLUGINS_SETUP := EF=$(SRCDIR)/sal/inc/sal/log-areas.dox && ICECC_EXTRAFILES=$$EF CCACHE_EXTRAFILES=$$EF |