You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@harmony.apache.org by od...@apache.org on 2009/02/25 16:51:27 UTC

svn commit: r747838 - /harmony/enhanced/classlib/trunk/depends/build/rules.mk

Author: odeakin
Date: Wed Feb 25 15:51:27 2009
New Revision: 747838

URL: http://svn.apache.org/viewvc?rev=747838&view=rev
Log:
Do not alter library link options on zOS, as -l does not work in the same way as other Unix platforms.

Modified:
    harmony/enhanced/classlib/trunk/depends/build/rules.mk

Modified: harmony/enhanced/classlib/trunk/depends/build/rules.mk
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/depends/build/rules.mk?rev=747838&r1=747837&r2=747838&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/depends/build/rules.mk (original)
+++ harmony/enhanced/classlib/trunk/depends/build/rules.mk Wed Feb 25 15:51:27 2009
@@ -21,12 +21,18 @@
 CXXFLAGS := $(DEFINES) $(INCLUDES) $(OPT) $(CXXFLAGS) $(WARNFLAGS)
 EXPFILE = $(notdir $(basename $(DLLNAME))).exp
 
+ifneq ($(HY_OS),zos)
 # Convert $(LIBPATH)libblah.so to -L$(LIBPATH) ... -lblah, also for $(DLLPATH)
 MDLLIBARGS := \
   $(MDLLIBPREFIX) -L$(LIBPATH) -L$(DLLPATH) \
   $(patsubst $(LIBPATH)lib%$(HY_LINKLIB_SUFFIX),-l%, \
     $(patsubst $(DLLPATH)lib%$(HY_LINKLIB_SUFFIX),-l%, $(MDLLIBFILES))) \
   $(MDLLIBSUFFIX)
+else
+# Do not change on zOS
+MDLLIBARGS := \
+  $(MDLLIBPREFIX) $(MDLLIBFILES) $(MDLLIBSUFFIX)
+endif
 
 all: $(DLLNAME) $(EXENAME) $(LIBNAME)