harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From regi...@apache.org
Subject svn commit: r979545 - in /harmony/enhanced/java/trunk/classlib: depends/build/platform/zos.s390.mk depends/build/platform/zos.s390x.mk modules/archive/src/main/native/archive/unix/makefile
Date Tue, 27 Jul 2010 05:52:12 GMT
Author: regisxu
Date: Tue Jul 27 05:52:11 2010
New Revision: 979545

URL: http://svn.apache.org/viewvc?rev=979545&view=rev
Log:
Fix build on z/OS.

.so libraries should alse be placed in $(HY_HDK)/jdk/jre/bin, .x files
will be moved to $(HY_HDK)/lib.

Modified:
    harmony/enhanced/java/trunk/classlib/depends/build/platform/zos.s390.mk
    harmony/enhanced/java/trunk/classlib/depends/build/platform/zos.s390x.mk
    harmony/enhanced/java/trunk/classlib/modules/archive/src/main/native/archive/unix/makefile

Modified: harmony/enhanced/java/trunk/classlib/depends/build/platform/zos.s390.mk
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/trunk/classlib/depends/build/platform/zos.s390.mk?rev=979545&r1=979544&r2=979545&view=diff
==============================================================================
--- harmony/enhanced/java/trunk/classlib/depends/build/platform/zos.s390.mk (original)
+++ harmony/enhanced/java/trunk/classlib/depends/build/platform/zos.s390.mk Tue Jul 27 05:52:11
2010
@@ -49,9 +49,5 @@ WARNFLAGS =
 # z/OS has different debug flags
 HYDEBUGCFLAGS = -g -O0
 
-# On z/OS set DLLPATH to LIBPATH so we link against .x export files in
-# $(HY_HDK)/lib instead of directly against the .so libraries.
-DLLPATH=$(LIBPATH)
-
 # AR doesn't support the 'o' option on z/OS so mtime will be updated
 AREXTRACT= x

Modified: harmony/enhanced/java/trunk/classlib/depends/build/platform/zos.s390x.mk
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/trunk/classlib/depends/build/platform/zos.s390x.mk?rev=979545&r1=979544&r2=979545&view=diff
==============================================================================
--- harmony/enhanced/java/trunk/classlib/depends/build/platform/zos.s390x.mk (original)
+++ harmony/enhanced/java/trunk/classlib/depends/build/platform/zos.s390x.mk Tue Jul 27 05:52:11
2010
@@ -49,9 +49,5 @@ WARNFLAGS =
 # z/OS has different debug flags
 HYDEBUGCFLAGS = -g -O0
 
-# On z/OS set DLLPATH to LIBPATH so we link against .x export files in
-# $(HY_HDK)/lib instead of directly against the .so libraries.
-DLLPATH=$(LIBPATH)
-
 # AR doesn't support the 'o' option on z/OS so mtime will be updated
 AREXTRACT= x

Modified: harmony/enhanced/java/trunk/classlib/modules/archive/src/main/native/archive/unix/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/trunk/classlib/modules/archive/src/main/native/archive/unix/makefile?rev=979545&r1=979544&r2=979545&view=diff
==============================================================================
--- harmony/enhanced/java/trunk/classlib/modules/archive/src/main/native/archive/unix/makefile
(original)
+++ harmony/enhanced/java/trunk/classlib/modules/archive/src/main/native/archive/unix/makefile
Tue Jul 27 05:52:11 2010
@@ -33,9 +33,15 @@ ifeq ($(HY_LOCAL_ZLIB),true)
 DEFINES += -DHY_LOCAL_ZLIB
 OSLIBS += -lz
 else
+
+ifeq ($(HY_OS),zos)
+MDLLIBZLIB += $(LIBPATH)libhyzlib$(HY_LINKLIB_SUFFIX)
+else
 MDLLIBZLIB += $(DLLPATH)libhyzlib$(HY_LINKLIB_SUFFIX)
 endif
 
+endif
+
 MDLLIBFILES += \
 	$(MDLLIBZLIB) $(LIBPATH)libvmi$(HY_LINKLIB_SUFFIX)
 



Mime
View raw message