about summary refs log tree commit diff homepage
diff options
context:
space:
mode:
authorCristian Cadar <c.cadar@imperial.ac.uk>2013-10-11 11:55:23 +0100
committerCristian Cadar <c.cadar@imperial.ac.uk>2013-10-11 11:55:23 +0100
commitbda5951b4234fa67a75431162e5edc4acbb4af8b (patch)
treeb16f2d7d57e507d9a71a08d8e7c4373f9a2446ef
parentde6cc3646fa27a159015fd2a6c80a8d5c43715a6 (diff)
downloadklee-bda5951b4234fa67a75431162e5edc4acbb4af8b.tar.gz
Fixed compilation on LLVM 2.9. irreader should be linked only for LLVM >= 3.3
-rw-r--r--Makefile.config.in3
-rw-r--r--tools/klee/Makefile5
2 files changed, 7 insertions, 1 deletions
diff --git a/Makefile.config.in b/Makefile.config.in
index 1634238b..cd209127 100644
--- a/Makefile.config.in
+++ b/Makefile.config.in
@@ -11,6 +11,9 @@ LLVM_SRC_ROOT = @LLVM_SRC@
 # (this is *not* the same as OBJ_ROOT as defined in LLVM's Makefile.config).
 LLVM_OBJ_ROOT = @LLVM_OBJ@
 
+LLVM_VERSION_MAJOR = @LLVM_VERSION_MAJOR@
+LLVM_VERSION_MINOR = @LLVM_VERSION_MINOR@
+
 # Set this to the build mode used to build LLVM (not necessarily the same
 # as the build mode used for KLEE)
 LLVM_BUILD_MODE = @LLVM_BUILD_MODE@
diff --git a/tools/klee/Makefile b/tools/klee/Makefile
index 0721695f..e1dbefce 100644
--- a/tools/klee/Makefile
+++ b/tools/klee/Makefile
@@ -13,8 +13,11 @@ TOOLNAME = klee
 include $(LEVEL)/Makefile.config
 
 USEDLIBS = kleeCore.a kleeBasic.a kleeModule.a  kleaverSolver.a kleaverExpr.a kleeSupport.a 
-LINK_COMPONENTS = jit bitreader bitwriter ipo linker engine irreader
+LINK_COMPONENTS = jit bitreader bitwriter ipo linker engine
 
+ifeq ($(shell echo "$(LLVM_VERSION_MAJOR).$(LLVM_VERSION_MINOR) >= 3.3" | bc), 1)
+LINK_COMPONENTS += irreader
+endif
 include $(LEVEL)/Makefile.common
 
 LIBS += -lstp