Makefile updates contributed by Reid
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@10317 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/projects/Stacker/test/Makefile b/projects/Stacker/test/Makefile
index e4c7d9a..2f7ff8a 100644
--- a/projects/Stacker/test/Makefile
+++ b/projects/Stacker/test/Makefile
@@ -31,33 +31,38 @@
TESTS = $(LOGIC_TESTS) $(ARITHMETIC_TESTS) $(BITWISE_TESTS) $(STACK_TESTS) \
$(MEMORY_TESTS) $(CONTROL_TESTS) $(IO_TESTS)
+LLC_EXEC = $(BUILD_OBJ_ROOT)/tools/$(CONFIGURATION)/llc
+OPT_EXEC = $(BUILD_OBJ_ROOT)/tools/$(CONFIGURATION)/opt
+STKRC_EXEC = $(BUILD_OBJ_ROOT)/tools/$(CONFIGURATION)/stkrc
+LLVMDIS_EXEC = $(BUILD_OBJ_ROOT)/tools/$(CONFIGURATION)/llvm-dis
+
all :: test_each
test_each: $(TESTS)
@$(ECHO) "Running Tests..."
- $(VERB)$(BUILD_SRC_DIR)/runtests $(BUILD_OBJ_DIR) $(TESTS)
+ $(VERB) LD_LIBRARY_PATH=$(BUILD_OBJ_ROOT)/lib/$(CONFIGURATION) $(BUILD_SRC_DIR)/runtests $(BUILD_OBJ_DIR) $(TESTS)
% : %.s testing.s
@$(ECHO) "Compiling and Linking $< to $*"
- $(VERB)gcc -ggdb -L$(BUILD_OBJ_ROOT)/lib/Debug testing.s -lstkr_runtime -o $* $*.s
+ $(VERB)gcc -ggdb -L$(BUILD_OBJ_ROOT)/lib/$(CONFIGURATION) testing.s -lstkr_runtime -o $* $*.s
%.s : %.bc
@$(ECHO) "Compiling $< to $*.s"
- $(VERB)llc -f -o $*.s $<
+ $(VERB)$(LLC_EXEC) -f -o $*.s $<
ifdef OPTIMIZE
-%.bc : %.st $(BUILD_OBJ_ROOT)/tools/Debug/stkrc
+%.bc : %.st $(STKRC_EXEC)
@$(ECHO) "Compiling and Optimizing $< to $*.bc"
- $(VERB)stkrc -e -o - $< | opt -stats -q -f -o $*.bc -adce -branch-combine -cee -constmerge -constprop -dce -die -gcse -globaldce -instcombine -pre
+ $(VERB)$(STKRC_EXEC) -e -o - $< | opt -stats -q -f -o $*.bc -adce -branch-combine -cee -constmerge -constprop -dce -die -gcse -globaldce -instcombine -pre
else
-%.bc : %.st $(BUILD_OBJ_ROOT)/tools/Debug/stkrc
+%.bc : %.st $(STKRC_EXEC)
@$(ECHO) "Compiling $< to $*.bc"
- $(VERB)stkrc -e -f -o $*.bc $<
+ $(VERB)$(STKRC_EXEC) -e -f -o $*.bc $<
endif
%.ll : %.bc
@$(ECHO) "Disassembling $< to $*.ll"
- $(VERB)llvm-dis -o $*.ll $<
+ $(VERB)$(LLVMDIS_EXEC) -dis -o $*.ll $<
TESTS_LL = $(TESTS:%=%.ll)
TESTS_BC = $(TESTS:%=%.bc)