[test-suite] r175396 - Use LLVMCC_EMITIR_FLAG rather than -emit-llvm in the 7zip Makefile, unbreaking

Duncan Sands baldrick at free.fr
Sun Feb 17 07:21:11 PST 2013


Author: baldrick
Date: Sun Feb 17 09:21:11 2013
New Revision: 175396

URL: http://llvm.org/viewvc/llvm-project?rev=175396&view=rev
Log:
Use LLVMCC_EMITIR_FLAG rather than -emit-llvm in the 7zip Makefile, unbreaking
the dragonegg build.

Modified:
    test-suite/trunk/MultiSource/Benchmarks/7zip/Makefile

Modified: test-suite/trunk/MultiSource/Benchmarks/7zip/Makefile
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MultiSource/Benchmarks/7zip/Makefile?rev=175396&r1=175395&r2=175396&view=diff
==============================================================================
--- test-suite/trunk/MultiSource/Benchmarks/7zip/Makefile (original)
+++ test-suite/trunk/MultiSource/Benchmarks/7zip/Makefile Sun Feb 17 09:21:11 2013
@@ -262,12 +262,12 @@ Output/%.llvm.o: $(1)/%.c Output/.dir
 Output/%.llvm.o: $(1)/%.cpp Output/.dir
 	$$(RUNSAFELYLOCAL) /dev/null $$@.compile \
 	  $$(LCXX) $$(CPPFLAGS) $$(CXXFLAGS) $$(OPTFLAGS) $$(TARGET_FLAGS) -c $$< -o $$@
-Output/%.bc: $(1)/%.c Output/.dir
+Output/%.ll: $(1)/%.c Output/.dir
 	$$(RUNSAFELYLOCAL) /dev/null $$@.compile \
-	  $$(LCC) $$(CPPFLAGS) $$(CFLAGS) $$(OPTFLAGS) $$(TARGET_FLAGS) -emit-llvm -c $$< -o $$@
-Output/%.bc: $(1)/%.cpp Output/.dir
+	  $$(LCC) $$(CPPFLAGS) $$(CFLAGS) $$(OPTFLAGS) $$(TARGET_FLAGS) -S $$< -o $$@ $$(LLVMCC_EMITIR_FLAG)
+Output/%.ll: $(1)/%.cpp Output/.dir
 	$$(RUNSAFELYLOCAL) /dev/null $$@.compile \
-	  $$(LCXX) $$(CPPFLAGS) $$(CXXFLAGS) $$(OPTFLAGS) $$(TARGET_FLAGS) -emit-llvm -c $$< -o $$@
+	  $$(LCXX) $$(CPPFLAGS) $$(CXXFLAGS) $$(OPTFLAGS) $$(TARGET_FLAGS) -S $$< -o $$@ $$(LLVMCC_EMITIR_FLAG)
 endef
 
 $(foreach dir,$(SUBDIRS),$(eval $(call SUBDIR_template,$(PROJ_SRC_DIR)/$(dir))))





More information about the llvm-commits mailing list