harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hinde...@apache.org
Subject svn commit: r585919 - in /harmony/enhanced: classlib/trunk/modules/portlib/src/main/native/port/unix/makefile drlvm/trunk/build/make/build.xml drlvm/trunk/build/make/components/vm/vmi.xml
Date Thu, 18 Oct 2007 10:30:18 GMT
Author: hindessm
Date: Thu Oct 18 03:30:17 2007
New Revision: 585919

URL: http://svn.apache.org/viewvc?rev=585919&view=rev
Log:
Revert the "temporary" fix committed as r415407 in June 2006.

Modified:
    harmony/enhanced/classlib/trunk/modules/portlib/src/main/native/port/unix/makefile
    harmony/enhanced/drlvm/trunk/build/make/build.xml
    harmony/enhanced/drlvm/trunk/build/make/components/vm/vmi.xml

Modified: harmony/enhanced/classlib/trunk/modules/portlib/src/main/native/port/unix/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/portlib/src/main/native/port/unix/makefile?rev=585919&r1=585918&r2=585919&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/portlib/src/main/native/port/unix/makefile (original)
+++ harmony/enhanced/classlib/trunk/modules/portlib/src/main/native/port/unix/makefile Thu
Oct 18 03:30:17 2007
@@ -42,9 +42,4 @@
 DLLNAME = ../libhyprt$(HY_SHLIB_SUFFIX)
 EXPNAME = HYPRT_0.1
 
-# temp by geir - please ignore
-#
-LIBNAME = $(LIBPATH)libhyprt.a
-
-
 include $(HY_HDK)/build/make/rules.mk

Modified: harmony/enhanced/drlvm/trunk/build/make/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/build/make/build.xml?rev=585919&r1=585918&r2=585919&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/build/make/build.xml (original)
+++ harmony/enhanced/drlvm/trunk/build/make/build.xml Thu Oct 18 03:30:17 2007
@@ -79,6 +79,7 @@
         <property name="external.dep.CLASSLIB.includes" value="${external.dep.CLASSLIB}/deploy/include"
/>
         <property name="external.dep.CLASSLIB.libdir" value="${external.dep.CLASSLIB}/deploy/lib"
/>
         <property name="external.dep.CLASSLIB.jardir" value="${external.dep.CLASSLIB}/deploy/jdk/jre/lib/boot"/>
+        <property name="external.dep.CLASSLIB.dlldir" value="${external.dep.CLASSLIB}/deploy/jdk/jre/bin"/>
         
     </target>
 

Modified: harmony/enhanced/drlvm/trunk/build/make/components/vm/vmi.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/build/make/components/vm/vmi.xml?rev=585919&r1=585918&r2=585919&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/build/make/components/vm/vmi.xml (original)
+++ harmony/enhanced/drlvm/trunk/build/make/components/vm/vmi.xml Thu Oct 18 03:30:17 2007
@@ -90,7 +90,10 @@
                 <syslibset libs="msvcrt" />
             </select>
 
-            <libset libs="hyzip, hypool, hyprt"  dir="${external.dep.CLASSLIB.libdir}"
/>
+            <libset libs="hyzip, hypool"
+                    dir="${external.dep.CLASSLIB.libdir}" />
+            <libset libs="hyprt"
+                    dir="${external.dep.CLASSLIB.dlldir}" />
 
         </linker>
     </target>



Mime
View raw message