[vmkit-commits] [vmkit] r84635 - /vmkit/trunk/Makefile.rules

[Nicolas Geoffray]

Author: geoffray
Date: Tue Oct 20 09:54:42 2009
New Revision: 84635

URL: http://llvm.org/viewvc/llvm-project?rev=84635&view=rev
Log:
Use MMTKRuntime.so if LLVM_GCC is not present.


Modified:
    vmkit/trunk/Makefile.rules

Modified: vmkit/trunk/Makefile.rules
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/Makefile.rules?rev=84635&r1=84634&r2=84635&view=diff

==============================================================================
--- vmkit/trunk/Makefile.rules (original)
+++ vmkit/trunk/Makefile.rules Tue Oct 20 09:54:42 2009
@@ -1,5 +1,6 @@
 ifdef VMKIT_RUNTIME
 
+
 .PRECIOUS: LLVMRuntime.inc
 
 # All of these files depend on tblgen and the .td files.
@@ -123,15 +124,19 @@
 endif
 endif
 
-ifeq ($(WITH_LLVM_GCC), 1)
 ifdef RUN_ANT
 ifdef ANT
 
+ifeq ($(WITH_LLVM_GCC), 1)
+ADDITIONAL_ARGS := -load-bc=$(LibDir)/MMTKRuntime.bc
+else
+ADDITIONAL_ARGS := -load=$(LibDir)/MMTKRuntime$(SHLIBEXT) 
+endif
 
 all::
 	$(Verb) $(ANT)
 	$(Echo) Building $(BuildMode) $(JARNAME).jar $(notdir $@)
-	$(Verb) $(VMJC) -std-compile-opts -load-bc=$(LibDir)/MMTKRuntime.bc -load=$(LibDir)/MMTKMagic$(SHLIBEXT) -LowerMagic -verify $(JARNAME).jar -disable-exceptions -disable-cooperativegc -with-clinit=org/mmtk/vm/VM,org/mmtk/utility/*,org/mmtk/policy/*,org/j3/config/* -Dmmtk.hostjvm=org.j3.mmtk.Factory -o $(JARNAME).bc -Dmmtk.properties=vmkit.properties -disable-stubs -assume-compiled
+	$(Verb) $(VMJC) -std-compile-opts $(ADDITIONAL_ARGS) -load=$(LibDir)/MMTKMagic$(SHLIBEXT) -LowerMagic -verify $(JARNAME).jar -disable-exceptions -disable-cooperativegc -with-clinit=org/mmtk/vm/VM,org/mmtk/utility/*,org/mmtk/policy/*,org/j3/config/* -Dmmtk.hostjvm=org.j3.mmtk.Factory -o $(JARNAME).bc -Dmmtk.properties=vmkit.properties -disable-stubs -assume-compiled
 	$(Verb) $(LOPT) -load=$(LibDir)/MMTKMagic$(SHLIBEXT) -std-compile-opts -LowerJavaRT -f $(JARNAME).bc -o $(JARNAME)-optimized.bc
 
     
@@ -139,4 +144,3 @@
 clean-local::
 	$(Verb) $(RM) -rf classes $(JARNAME).jar $(JARNAME).bc $(JARNAME)-optimized.bc
 endif
-endif