harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hinde...@apache.org
Subject svn commit: r939686 - /harmony/enhanced/java/trunk/drlvm/make/vm/vmcore.xml
Date Fri, 30 Apr 2010 14:25:52 GMT
Author: hindessm
Date: Fri Apr 30 14:25:52 2010
New Revision: 939686

URL: http://svn.apache.org/viewvc?rev=939686&view=rev
Log:
Use hyzlib on unix unless hy.local.zlib=true (hy.local.zlib could be used
on windows too but I don't expect it to be).

Modified:
    harmony/enhanced/java/trunk/drlvm/make/vm/vmcore.xml

Modified: harmony/enhanced/java/trunk/drlvm/make/vm/vmcore.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/trunk/drlvm/make/vm/vmcore.xml?rev=939686&r1=939685&r2=939686&view=diff
==============================================================================
--- harmony/enhanced/java/trunk/drlvm/make/vm/vmcore.xml (original)
+++ harmony/enhanced/java/trunk/drlvm/make/vm/vmcore.xml Fri Apr 30 14:25:52 2010
@@ -187,15 +187,17 @@
                     dir="${drlvm.lib.dir}" />
                 <libset libs="hythr" dir="${drlvm.shlib.dir}" />
                 <libset libs="icuuc" dir="${drlvm.shlib.dir}"/>
-                <libset libs="hyzlib" dir="${hy.hdk.shlibs}" if="is.windows"/>
                 <libset libs="ch" dir="${drlvm.shlib.dir}" />
+                <libset libs="hyzlib" dir="${hy.hdk.shlibs}"
+                        unless="hy.skip.zlib"/>
+                <syslibset type="shared" libs="z" if="hy.skip.zlib"/>
 
                 <linkerarg value="/DEF:${vm.home}/vmcore/src/harmonyvm64.def" if="is.windows.x86_64"/>
                 <linkerarg value="/DEF:${vm.home}/vmcore/src/harmonyvm.def" if="is.windows.x86"/>
                 <linkerarg value="--version-script=${vm.home}/vmcore/build/vmcore.exp"
if="is.unix"/>
                 
-                <syslibset type="shared" libs="m,dl,stdc++,z,xml2,pthread,gcc_s,rt" if="is.linux"/>
-                <syslibset type="shared" libs="m,stdc++,z,pthread" if="is.freebsd"/>

+                <syslibset type="shared" libs="m,dl,stdc++,xml2,pthread,gcc_s,rt" if="is.linux"/>
+                <syslibset type="shared" libs="m,stdc++,pthread" if="is.freebsd"/>

                 <libset libs="xml2" dir="/usr/local/lib" if="is.freebsd"/>
                 <linkerarg value="--export-dynamic" if="is.freebsd"/>
             </linker>



Mime
View raw message