summaryrefslogtreecommitdiff
path: root/compilerplugins
diff options
context:
space:
mode:
authorLuboš Luňák <l.lunak@suse.cz>2013-01-06 18:09:04 +0100
committerLuboš Luňák <l.lunak@suse.cz>2013-01-06 18:23:04 +0100
commit62532ad485698b70924c54a222890ebcb714dc39 (patch)
tree52255931bfea28c62361fb3ac94abee09b160ef4 /compilerplugins
parenta4298f86f5a6cd4033af541103d0a33a241edeeb (diff)
do not set our clang timestamp to the timestamp of the clang binary
If the clang binary comes from a package which had been built before any of our clang related sources were changed the last time, the timestamp would be older and so there would be no rebuild. So do the stamp handling the usual way, clang upgrades will work fine, downgrades will not, but that's the same problem like with downgrading a library and its headers. To somewhat mitigate the problem (Clang plugin doesn't get cleaned by 'make clean'), include the full Clang version (which includes SVN revision) in config_clang.h and make all Clang plugin code include that, so at least configure re-run will trigger a rebuild if necessary. Change-Id: I993197f79e92e36105092c92c33b2e1db343e975
Diffstat (limited to 'compilerplugins')
-rw-r--r--compilerplugins/Makefile-clang.mk2
-rw-r--r--compilerplugins/clang/plugin.cxx2
-rw-r--r--compilerplugins/clang/plugin.hxx2
-rw-r--r--compilerplugins/clang/sallogareas.cxx2
4 files changed, 3 insertions, 5 deletions
diff --git a/compilerplugins/Makefile-clang.mk b/compilerplugins/Makefile-clang.mk
index e652e44e22d4..53c0f2c429f6 100644
--- a/compilerplugins/Makefile-clang.mk
+++ b/compilerplugins/Makefile-clang.mk
@@ -69,6 +69,6 @@ $(CLANGOUTDIR)/plugin.so: $(CLANGOBJS)
# Clang most probably doesn't maintain binary compatibility, so rebuild when clang changes.
$(CLANGOUTDIR)/clang-timestamp: $(CLANGDIR)/bin/clang
- touch $@ -r $^
+ touch $@
# vim: set noet sw=4 ts=4:
diff --git a/compilerplugins/clang/plugin.cxx b/compilerplugins/clang/plugin.cxx
index 11791b196fef..7c4256b9f73d 100644
--- a/compilerplugins/clang/plugin.cxx
+++ b/compilerplugins/clang/plugin.cxx
@@ -26,8 +26,6 @@
#include "sallogareas.hxx"
#include "unusedvariablecheck.hxx"
-#include <config_clang.h>
-
namespace loplugin
{
diff --git a/compilerplugins/clang/plugin.hxx b/compilerplugins/clang/plugin.hxx
index b9409b2cfc1c..af1394d57b6f 100644
--- a/compilerplugins/clang/plugin.hxx
+++ b/compilerplugins/clang/plugin.hxx
@@ -11,6 +11,8 @@
#ifndef PLUGIN_H
#define PLUGIN_H
+#include <config_clang.h>
+
#include <clang/AST/RecursiveASTVisitor.h>
#if __clang_major__ < 3 || __clang_major__ == 3 && __clang_minor__ < 2
diff --git a/compilerplugins/clang/sallogareas.cxx b/compilerplugins/clang/sallogareas.cxx
index 4462413f7ced..7e6c187d7e9a 100644
--- a/compilerplugins/clang/sallogareas.cxx
+++ b/compilerplugins/clang/sallogareas.cxx
@@ -16,8 +16,6 @@
#include <fstream>
-#include <config_clang.h>
-
namespace loplugin
{