You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@harmony.apache.org by hi...@apache.org on 2008/01/08 12:10:04 UTC

svn commit: r609932 - in /harmony/enhanced/drlvm/trunk/build/make: build.xml targets/common_vm.xml

Author: hindessm
Date: Tue Jan  8 03:10:03 2008
New Revision: 609932

URL: http://svn.apache.org/viewvc?rev=609932&view=rev
Log:
Make hy.no.sig and hy.local.zlib modes work correctly.

Modified:
    harmony/enhanced/drlvm/trunk/build/make/build.xml
    harmony/enhanced/drlvm/trunk/build/make/targets/common_vm.xml

Modified: harmony/enhanced/drlvm/trunk/build/make/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/build/make/build.xml?rev=609932&r1=609931&r2=609932&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/build/make/build.xml (original)
+++ harmony/enhanced/drlvm/trunk/build/make/build.xml Tue Jan  8 03:10:03 2008
@@ -245,6 +245,20 @@
                 <isset property="is.ia64"/>
             </and>
         </condition>
+
+        <property name="hy.no.sig" value="false" />
+        <condition property="hy.skip.sig" value="true">
+            <not>
+                <equals arg1="${hy.no.sig}" arg2="false" />
+            </not>
+        </condition>
+
+        <property name="hy.local.zlib" value="false" />
+        <condition property="hy.skip.zlib" value="true">
+            <not>
+                <equals arg1="${hy.local.zlib}" arg2="false" />
+            </not>
+        </condition>
     </target>
 
     <!-- initialization target specific for unix -->

Modified: harmony/enhanced/drlvm/trunk/build/make/targets/common_vm.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/build/make/targets/common_vm.xml?rev=609932&r1=609931&r2=609932&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/build/make/targets/common_vm.xml (original)
+++ harmony/enhanced/drlvm/trunk/build/make/targets/common_vm.xml Tue Jan  8 03:10:03 2008
@@ -107,7 +107,7 @@
             <compilerarg value="/Qip" if="is.icl"/>
 
             <defineset define="HY_NO_SIG" if="hy.skip.sig"/>
-            <defineset define="HY_LOCAL_ZLIB" unless="hy.skip.zip.api"/>
+            <defineset define="HY_LOCAL_ZLIB" if="hy.skip.zlib"/>
 
         </compiler>