diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2014-02-25 10:55:26 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2014-02-25 10:56:34 +0100 |
| commit | 95700a2d7d09893fe16aadb406e93bf7164f7422 (patch) | |
| tree | 65c4e6f1178258857ea652f81cd00810cb1c8288 /compilerplugins | |
| parent | 1efe2782de94f55faac510d8fd4596fc54ea1d37 (diff) | |
Drop CLANGBUILD in addition to CLANGDIR
...see
<http://lists.freedesktop.org/archives/libreoffice/2014-February/059654.html>
"Drop CLANGBUILD in addition to CLANGDIR?"
Change-Id: I8d68aa0f2298240c8e7265cab273c602f5b6881a
Diffstat (limited to 'compilerplugins')
| -rw-r--r-- | compilerplugins/Makefile-clang.mk | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/compilerplugins/Makefile-clang.mk b/compilerplugins/Makefile-clang.mk index 5d09346ed9bb..2c57f4014ad2 100644 --- a/compilerplugins/Makefile-clang.mk +++ b/compilerplugins/Makefile-clang.mk @@ -21,7 +21,7 @@ CLANGCXXFLAGS=-O2 -Wall -Wextra -g # Clang headers require these. CLANGDEFS=-D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -D__STDC_LIMIT_MACROS -fno-rtti # All include locations needed. -CLANGINCLUDES=-isystem $(CLANGDIR)/include -isystem $(CLANGDIR)/tools/clang/include -isystem $(CLANGBUILD)/include -isystem $(CLANGBUILD)/tools/clang/include +CLANGINCLUDES=-isystem $(CLANGDIR)/include -isystem $(CLANGDIR)/tools/clang/include # Clang/LLVM libraries are intentionally not linked in, they are usually built as static libraries, which means the resulting # plugin would be big (even though the clang binary already includes it all) and it'd be necessary to explicitly specify @@ -93,7 +93,7 @@ $(CLANGOUTDIR)/plugin.so: $(CLANGOBJS) -Wl$(CLANG_COMMA)-undefined -Wl$(CLANG_COMMA)suppress) # 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 $(QUIET)touch $@ # vim: set noet sw=4 ts=4: |