about summary refs log tree commit diff homepage
path: root/lib
diff options
context:
space:
mode:
authorDaniel Dunbar <daniel@zuster.org>2014-09-12 14:06:30 -0700
committerDaniel Dunbar <daniel@zuster.org>2014-09-12 17:39:17 -0700
commit1592fc057fa81ca9714f5761325f61ad0c15747a (patch)
tree23fb4c15e541225a02346b34ba9b46c061a5c7ac /lib
parent13ae5fef303a54da6d9e2a30b23c3209c0a20d45 (diff)
downloadklee-1592fc057fa81ca9714f5761325f61ad0c15747a.tar.gz
Tweak the workarounds for multiple definition of PACKAGE_* macros from config.h files.
 - There seems to be a better solution for this by defining a macro prefix, per:

     http://www.gnu.org/software/autoconf-archive/ax_prefix_config_h.html

   but I have no experience with that and it looks like it might involve
   rewriting a bunch of our macro checks.
Diffstat (limited to 'lib')
-rw-r--r--lib/Core/StatsTracker.cpp7
1 files changed, 7 insertions, 0 deletions
diff --git a/lib/Core/StatsTracker.cpp b/lib/Core/StatsTracker.cpp
index 0946d2ba..e664d1ae 100644
--- a/lib/Core/StatsTracker.cpp
+++ b/lib/Core/StatsTracker.cpp
@@ -27,6 +27,13 @@
 #include "UserSearcher.h"
 #include "../Solver/SolverStats.h"
 
+// FIXME: Ugh, this is gross. But otherwise our config.h conflicts with LLVMs.
+#undef PACKAGE_BUGREPORT
+#undef PACKAGE_NAME
+#undef PACKAGE_STRING
+#undef PACKAGE_TARNAME
+#undef PACKAGE_VERSION
+
 #if LLVM_VERSION_CODE > LLVM_VERSION(3, 2)
 #include "llvm/IR/BasicBlock.h"
 #include "llvm/IR/Function.h"