[llvm-commits] [test-suite] r96861 - in /test-suite/trunk: Makefile.rules Makefile.tests

[Daniel Dunbar]

Author: ddunbar
Date: Mon Feb 22 20:09:29 2010
New Revision: 96861

URL: http://llvm.org/viewvc/llvm-project?rev=96861&view=rev
Log:
Switch to using LCC_PROGRAMS Makefile variable for the LCC subprograms (for
having proper dependencies on the compiler changing); which is more generic than expecting a cc1 executable.

Modified:
    test-suite/trunk/Makefile.rules
    test-suite/trunk/Makefile.tests

Modified: test-suite/trunk/Makefile.rules
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/Makefile.rules?rev=96861&r1=96860&r2=96861&view=diff
==============================================================================
--- test-suite/trunk/Makefile.rules (original)
+++ test-suite/trunk/Makefile.rules Mon Feb 22 20:09:29 2010
@@ -814,9 +814,7 @@
 
 endif
 
-LCC1 := $(LLVMCC1)
-LCC1XX := $(LLVMCC1PLUS)
-
+LCC_PROGRAMS := $(LLVMCC1) $(LLVMCC1PLUS)
 
 #---------------------------------------------------------
 .PRECIOUS: $(PROJ_OBJ_DIR)/Depend/.dir $(PROJ_OBJ_DIR)/BytecodeObj/.dir
@@ -842,10 +840,10 @@
 $(PROJ_OBJ_DIR)/Debug/%.lo: %.c $(PROJ_OBJ_DIR)/Debug/.dir 
 	$(CompileCG) $< -o $@
 
-$(PROJ_OBJ_DIR)/BytecodeObj/%.bc: %.cpp $(PROJ_OBJ_DIR)/BytecodeObj/.dir $(LCC1XX)
+$(PROJ_OBJ_DIR)/BytecodeObj/%.bc: %.cpp $(PROJ_OBJ_DIR)/BytecodeObj/.dir $(LCC_PROGRAMS)
 	$(LLVMGXX) $(CPPFLAGS) -c $< -o $@
 
-$(PROJ_OBJ_DIR)/BytecodeObj/%.bc: %.c $(PROJ_OBJ_DIR)/BytecodeObj/.dir $(LCC1)
+$(PROJ_OBJ_DIR)/BytecodeObj/%.bc: %.c $(PROJ_OBJ_DIR)/BytecodeObj/.dir $(LCC_PROGRAMS)
 	$(LLVMGCC) $(CPPFLAGS) -c $< -o $@
 
 $(PROJ_OBJ_DIR)/BytecodeObj/%.bc: %.ll $(PROJ_OBJ_DIR)/BytecodeObj/.dir $(LLVMAS)

Modified: test-suite/trunk/Makefile.tests
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/Makefile.tests?rev=96861&r1=96860&r2=96861&view=diff
==============================================================================
--- test-suite/trunk/Makefile.tests (original)
+++ test-suite/trunk/Makefile.tests Mon Feb 22 20:09:29 2010
@@ -38,27 +38,27 @@
 	$(RM) -rf Output/
 
 # Compile from X.c to Output/X.bc
-Output/%.bc: %.c $(LCC1) Output/.dir $(INCLUDES)
+Output/%.bc: %.c $(LCC_PROGRAMS) Output/.dir $(INCLUDES)
 	-$(LLVMGCC) $(CPPFLAGS) $(CFLAGS) $(LOPTFLAGS) $(TARGET_FLAGS) -c $< -o $@ -emit-llvm
 
 # Compile from X.cpp to Output/X.bc
-Output/%.bc: %.cpp $(LCC1XX) Output/.dir $(INCLUDES)
+Output/%.bc: %.cpp $(LCC_PROGRAMS) Output/.dir $(INCLUDES)
 	-$(LLVMGXX) $(CPPFLAGS) $(CXXFLAGS) $(LOPTFLAGS) $(TARGET_FLAGS) -c $< -o $@ -emit-llvm
 
 # Compile from X.cc to Output/X.bc
-Output/%.bc: %.cc $(LCC1XX) Output/.dir $(INCLUDES)
+Output/%.bc: %.cc $(LCC_PROGRAMS) Output/.dir $(INCLUDES)
 	-$(LLVMGXX) $(CPPFLAGS) $(CXXFLAGS) $(LOPTFLAGS) $(TARGET_FLAGS) -c $< -o $@ -emit-llvm
 
 # Compile from X.C to Output/X.bc
-Output/%.bc: %.C $(LCC1XX) Output/.dir $(INCLUDES)
+Output/%.bc: %.C $(LCC_PROGRAMS) Output/.dir $(INCLUDES)
 	-$(LLVMGXX) $(CPPFLAGS) $(CXXFLAGS) $(LOPTFLAGS) $(TARGET_FLAGS) -c $< -o $@ -emit-llvm
 
 # Compile from X.m to Output/X.bc
-Output/%.bc: %.m $(LCC1) Output/.dir $(INCLUDES)
+Output/%.bc: %.m $(LCC_PROGRAMS) Output/.dir $(INCLUDES)
 	-$(LLVMGCC) $(CPPFLAGS) $(CFLAGS) $(LOPTFLAGS) $(TARGET_FLAGS) -c $< -o $@ -emit-llvm
 
 # Compile from X.mm to Output/X.bc
-Output/%.bc: %.mm $(LCC1XX) Output/.dir $(INCLUDES)
+Output/%.bc: %.mm $(LCC_PROGRAMS) Output/.dir $(INCLUDES)
 	-$(LLVMGXX) $(CPPFLAGS) $(CXXFLAGS) $(LOPTFLAGS) $(TARGET_FLAGS) -c $< -o $@ -emit-llvm
 
 # LLVM Assemble from X.ll to Output/X.bc.  Because we are coming directly from