[vmkit-commits] [vmkit] r83388 - in /vmkit/trunk: Makefile.config.in Makefile.rules

[Nicolas Geoffray]

Author: geoffray
Date: Tue Oct  6 11:45:09 2009
New Revision: 83388

URL: http://llvm.org/viewvc/llvm-project?rev=83388&view=rev
Log:
Use the ANT that was found by configure.


Modified:
    vmkit/trunk/Makefile.config.in
    vmkit/trunk/Makefile.rules

Modified: vmkit/trunk/Makefile.config.in
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/Makefile.config.in?rev=83388&r1=83387&r2=83388&view=diff

==============================================================================
--- vmkit/trunk/Makefile.config.in (original)
+++ vmkit/trunk/Makefile.config.in Tue Oct  6 11:45:09 2009
@@ -13,3 +13,5 @@
 SINGLE_BUILD = @SINGLE_BUILD@
 WITH_64 = @WITH_64@
 WITH_LLVM_GCC = @WITH_LLVM_GCC@
+
+ANT = @ANT@

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

==============================================================================
--- vmkit/trunk/Makefile.rules (original)
+++ vmkit/trunk/Makefile.rules Tue Oct  6 11:45:09 2009
@@ -124,8 +124,8 @@
 endif
 
 ifdef RUN_ANT
+ifdef ANT
 
-ANT = ant
 
 all::
 	$(Verb) $(ANT)
@@ -133,7 +133,8 @@
 	$(Verb) $(VMJC) -std-compile-opts -load=$(LibDir)/MMTKRuntime$(SHLIBEXT) -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
 	$(Verb) $(LOPT) -load=$(LibDir)/MMTKMagic$(SHLIBEXT) -std-compile-opts -LowerJavaRT -f $(JARNAME).bc -o $(JARNAME)-optimized.bc
 
+    
+endif
 clean-local::
 	$(Verb) $(RM) -rf classes $(JARNAME).jar $(JARNAME).bc $(JARNAME)-optimized.bc
-    
 endif