summaryrefslogtreecommitdiff
path: root/compilerplugins/Makefile-clang.mk
diff options
context:
space:
mode:
authorLuboš Luňák <l.lunak@collabora.com>2019-05-26 14:31:54 +0200
committerLuboš Luňák <l.lunak@collabora.com>2019-05-27 16:03:41 +0200
commit5e075c3fbfd13d24042e420c340e9ae05f942dc5 (patch)
tree15c2e455880b49e4385abe21b7cc14f2ffc87e7a /compilerplugins/Makefile-clang.mk
parentd4bb16adcd2327cb99b42f64d62a180a0f08c147 (diff)
fix compilerplugin rebuilding when system clang changes
Since Clang doesn't keep backwards binary compatibility, it's necessary to rebuild when Clang (major version?) changes. This was broken because e.g. check.cxx didn't include plugin.hxx, and so it didn't depend on config_clang.h . Now simply force timestamp change if config_clang.h changes. This still needs re-running configure though. Change-Id: Icbc404b37105599f1ca6c8996f5a3d45d50082db Reviewed-on: https://gerrit.libreoffice.org/72976 Tested-by: Jenkins Reviewed-by: Luboš Luňák <l.lunak@collabora.com>
Diffstat (limited to 'compilerplugins/Makefile-clang.mk')
-rw-r--r--compilerplugins/Makefile-clang.mk6
1 files changed, 4 insertions, 2 deletions
diff --git a/compilerplugins/Makefile-clang.mk b/compilerplugins/Makefile-clang.mk
index 7cdf407bd0f0..ce3ab90a0ec2 100644
--- a/compilerplugins/Makefile-clang.mk
+++ b/compilerplugins/Makefile-clang.mk
@@ -171,8 +171,10 @@ else
-Wl$(CLANG_COMMA)-undefined -Wl$(CLANG_COMMA)suppress)
endif
-# Clang most probably doesn't maintain binary compatibility, so rebuild when clang changes.
-$(CLANGOUTDIR)/clang-timestamp: $(CLANGDIR)/bin/clang$(CLANG_EXE_EXT)
+# Clang most probably doesn't maintain binary compatibility, so rebuild when clang changes
+# (either the binary can change if it's a local build, or config_clang.h will change if configure detects
+# a new version of a newly installed system clang).
+$(CLANGOUTDIR)/clang-timestamp: $(CLANGDIR)/bin/clang$(CLANG_EXE_EXT) $(BUILDDIR)/config_host/config_clang.h
$(QUIET)touch $@