diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2012-12-07 16:07:41 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2012-12-07 16:09:26 +0100 |
| commit | a6d6d1c24ba497ac8586857baed9d4fb155a17b1 (patch) | |
| tree | bfd4b26854fb40ae3e9d0f01971f61359c507111 /compilerplugins | |
| parent | 45237f80237f202b278f0561e6b93db2a2306b6a (diff) | |
CLANGPLUGIN_CPPFLAGS did not actually work
...it just appeared to work on machines that happen to have /usr/bin/clang. So
hoist CLANGDIR/CLANGBUILD from compilerplugins/Makefile-clang.mk to configure.ac
instead.
Change-Id: Ie5d9c6bb8e9d0caa1583d78c8693f06b69873095
Diffstat (limited to 'compilerplugins')
| -rw-r--r-- | compilerplugins/Makefile-clang.mk | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/compilerplugins/Makefile-clang.mk b/compilerplugins/Makefile-clang.mk index 9b24df07ab6b..4d405e9bc5d2 100644 --- a/compilerplugins/Makefile-clang.mk +++ b/compilerplugins/Makefile-clang.mk @@ -22,10 +22,6 @@ CLANGSRC= \ # Compile flags ('make CLANGCXXFLAGS=-g' if you need to debug the plugin) CLANGCXXFLAGS=-O2 -Wall -g -# The prefix where Clang resides, override to where Clang resides if using a source build. -CLANGDIR=/usr -# The build directory (different from CLANGDIR if using a Clang out-of-source build) -CLANGBUILD=/usr # The uninteresting rest. @@ -56,7 +52,7 @@ CLANGOBJS= define clangbuildsrc $(3): $(2) $(SRCDIR)/compilerplugins/Makefile-clang.mk $(CLANGOUTDIR)/clang-timestamp @echo [build CXX] $(subst $(SRCDIR)/,,$(2)) - $(CXX) $(CLANGPLUGIN_CPPFLAGS) $(CLANGCXXFLAGS) $(CLANGDEFS) $(CLANGINCLUDES) -DSRCDIR=$(SRCDIR) $(2) -fPIC -c -o $(3) -MMD -MT $(3) -MP -MF $(CLANGOUTDIR)/$(1).d + $(CXX) $(CLANGCXXFLAGS) $(CLANGDEFS) $(CLANGINCLUDES) -DSRCDIR=$(SRCDIR) $(2) -fPIC -c -o $(3) -MMD -MT $(3) -MP -MF $(CLANGOUTDIR)/$(1).d -include $(CLANGOUTDIR)/$(1).d @@ -71,7 +67,7 @@ $(CLANGOUTDIR)/plugin.so: $(CLANGOBJS) $(CXX) -shared $(CLANGOBJS) -o $@ # Clang most probably doesn't maintain binary compatibility, so rebuild when clang changes. -$(CLANGOUTDIR)/clang-timestamp: $(CLANGBUILD)/bin/clang +$(CLANGOUTDIR)/clang-timestamp: $(CLANGDIR)/bin/clang touch $@ -r $^ # vim: set noet sw=4 ts=4: |