From 1592fc057fa81ca9714f5761325f61ad0c15747a Mon Sep 17 00:00:00 2001 From: Daniel Dunbar Date: Fri, 12 Sep 2014 14:06:30 -0700 Subject: 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. --- lib/Core/StatsTracker.cpp | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'lib/Core') 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" -- cgit 1.4.1