about summary refs log tree commit diff homepage
diff options
context:
space:
mode:
authorDaniel Dunbar <daniel@zuster.org>2014-09-12 14:59:03 -0700
committerDaniel Dunbar <daniel@zuster.org>2014-09-12 17:39:18 -0700
commit25c30c36e689f9b74b5c00e6655e743cbba356e4 (patch)
tree14a3981c3f41e3fa5816e975979c6510acf19155
parentf9ffeb3e1da75178d7b49cf498b73ef14f7957a6 (diff)
downloadklee-25c30c36e689f9b74b5c00e6655e743cbba356e4.tar.gz
Update Concrete test Makefile for LLVM changes.
-rw-r--r--test/Concrete/Makefile8
1 files changed, 4 insertions, 4 deletions
diff --git a/test/Concrete/Makefile b/test/Concrete/Makefile
index 4acfadad..57801c1c 100644
--- a/test/Concrete/Makefile
+++ b/test/Concrete/Makefile
@@ -19,15 +19,15 @@ include ${LEVEL}/Makefile.common
 
 # Compile from X.c to Output/X.ll
 Output/%.ll: %.c $(LCC1) Output/.dir $(INCLUDES)
-	$(LLVMGCCWITHPATH) --emit-llvm $(CPPFLAGS) $(LCCFLAGS) -S $< -o $@
+	$(LLVMCC) -emit-llvm $(CPPFLAGS) $(LCCFLAGS) -S $< -o $@
 
 # Compile from X.cpp to Output/X.ll
 Output/%.ll: %.cpp $(LCC1XX) Output/.dir $(INCLUDES)
-	$(LLVMGXXWITHPATH) --emit-llvm $(CPPFLAGS) $(LCXXFLAGS) -S $< -o $@
+	$(LLVMCXX) -emit-llvm $(CPPFLAGS) $(LCXXFLAGS) -S $< -o $@
 
 # Compile from X.cc to Output/X.ll
 Output/%.ll: %.cc $(LCC1XX) Output/.dir $(INCLUDES)
-	$(LLVMGXXWITHPATH) --emit-llvm $(CPPFLAGS) $(LCXXFLAGS) -S $< -o $@
+	$(LLVMCXX) -emit-llvm $(CPPFLAGS) $(LCXXFLAGS) -S $< -o $@
 
 # LLVM Assemble from Output/X.ll to Output/X.bc.  Output/X.ll must have come
 # from GCC output, so use GCCAS.
@@ -42,7 +42,7 @@ Output/%.bc: %.ll $(LLVMAS) Output/.dir
 	$(LLVMAS) -f $< -o $@
 
 Output/linked_%.bc: Output/%.bc Output/_testingUtils.bc
-	$(LLVMLD) -disable-opt -link-as-library Output/_testingUtils.bc $< -o $@
+	$(LLVMLD) Output/_testingUtils.bc $< -o $@
 
 .PRECIOUS: Output/.dir