harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From var...@apache.org
Subject svn commit: r616666 - in /harmony/enhanced: common_resources/make/properties.xml drlvm/trunk/make/vm/vmcore.xml
Date Wed, 30 Jan 2008 07:24:46 GMT
Author: varlax
Date: Tue Jan 29 23:24:45 2008
New Revision: 616666

URL: http://svn.apache.org/viewvc?rev=616666&view=rev
Log:
Fixed icuuc lib lookup/link

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

Modified: harmony/enhanced/common_resources/make/properties.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/common_resources/make/properties.xml?rev=616666&r1=616665&r2=616666&view=diff
==============================================================================
--- harmony/enhanced/common_resources/make/properties.xml (original)
+++ harmony/enhanced/common_resources/make/properties.xml Tue Jan 29 23:24:45 2008
@@ -225,6 +225,11 @@
         <isset property="is.windows" />
     </condition>
     <property name="object.suffix" value=".o" />
+    
+    <condition property="linklib.prefix" value="">
+        <isset property="is.windows"/>
+    </condition>
+    <property name="linklib.prefix" value="lib" />
 
     <condition property="linklib.suffix" value=".lib">
         <isset property="is.windows"/>

Modified: harmony/enhanced/drlvm/trunk/make/vm/vmcore.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/make/vm/vmcore.xml?rev=616666&r1=616665&r2=616666&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/make/vm/vmcore.xml (original)
+++ harmony/enhanced/drlvm/trunk/make/vm/vmcore.xml Tue Jan 29 23:24:45 2008
@@ -41,7 +41,8 @@
     
     <target name="-check-setup">
         <available file="${drlvm.include.dir}/unicode" property="icu4c.hdr.available"/>
-        <available file="${shlib.prefix}icuuc${shlib.suffix}" property="icu4c.lib.available"/>
+        <available file="${drlvm.shlib.dir}/${linklib.prefix}icuuc${linklib.suffix}" 
+            property="icu4c.lib.available"/>
         <condition property="setup.complete">
             <and>
                 <isset property="icu4c.hdr.available"/>
@@ -66,7 +67,7 @@
             </patternset>
         </unzip>
         <check-one-link message="" src="${drlvm.shlib.dir}/${icuuc.linkname}"
-            dest="${drlvm.shlib.dir}/${shlib.prefix}icuuc${shlib.suffix}"/>
+            dest="${drlvm.shlib.dir}/${linklib.prefix}icuuc${linklib.suffix}"/>
     </target>
 
     <target name="-check-setup-win" if="is.windows">



Mime
View raw message