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

[Nicolas Geoffray]

Author: geoffray
Date: Tue Jul 20 03:31:02 2010
New Revision: 108819

URL: http://llvm.org/viewvc/llvm-project?rev=108819&view=rev
Log:
Add a flag to disable MMTk compilation.


Modified:
    vmkit/trunk/Makefile.rules

Modified: vmkit/trunk/Makefile.rules
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/Makefile.rules?rev=108819&r1=108818&r2=108819&view=diff
==============================================================================
--- vmkit/trunk/Makefile.rules (original)
+++ vmkit/trunk/Makefile.rules Tue Jul 20 03:31:02 2010
@@ -127,9 +127,10 @@
 ifdef RUN_ANT
 ifdef ANT
 
-ADDITIONAL_ARGS := -load-bc=$(LibDir)/MMTKRuntime.bc 
+ifneq ($(DISABLE_MMTK_COMPILE), 1)
+  ADDITIONAL_ARGS := -load-bc=$(LibDir)/MMTKRuntime.bc 
 
-all::
+  all::
 	$(Verb) $(ANT) -buildfile $(PROJ_SRC_ROOT)/mmtk/java/build.xml
 	$(Echo) Building $(BuildMode) $(JARNAME).jar $(notdir $@)
 	$(Verb) $(LOPT) -load=$(LibDir)/JITGCPass$(SHLIBEXT) -std-compile-opts -JITGCPass -f $(LibDir)/MMTKAlloc.bc -o $(LibDir)/MMTKAlloc.bc
@@ -138,8 +139,8 @@
 	$(Verb) $(LLVMLD) -r -o $(LibDir)/FinalMMTk.bc $(LibDir)/MMTKAlloc.bc $(JARNAME)-optimized.bc $(LibDir)/MMTKRuntime.bc
 	$(Verb) $(LOPT) -std-compile-opts $(LibDir)/FinalMMTk.bc -o $(LibDir)/FinalMMTk.bc
 	#$(Verb) $(LLC) -march=cpp -cppgen=function -cppfor=gcmalloc $(LibDir)/FinalMMTk.bc -o $(PROJ_SRC_ROOT)/lib/Mvm/Compiler/MMTkInline.inc
+endif
 
-    
 endif
 clean-local::
 	$(Verb) $(RM) -rf classes $(JARNAME).jar $(JARNAME).bc $(JARNAME)-optimized.bc