Return-Path: Delivered-To: apmail-harmony-commits-archive@www.apache.org Received: (qmail 39327 invoked from network); 25 Feb 2009 15:51:51 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 25 Feb 2009 15:51:51 -0000 Received: (qmail 18584 invoked by uid 500); 25 Feb 2009 15:51:51 -0000 Delivered-To: apmail-harmony-commits-archive@harmony.apache.org Received: (qmail 18569 invoked by uid 500); 25 Feb 2009 15:51:51 -0000 Mailing-List: contact commits-help@harmony.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@harmony.apache.org Delivered-To: mailing list commits@harmony.apache.org Received: (qmail 18556 invoked by uid 99); 25 Feb 2009 15:51:51 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 25 Feb 2009 07:51:51 -0800 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 25 Feb 2009 15:51:48 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 7CD19238889F; Wed, 25 Feb 2009 15:51:27 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r747838 - /harmony/enhanced/classlib/trunk/depends/build/rules.mk Date: Wed, 25 Feb 2009 15:51:27 -0000 To: commits@harmony.apache.org From: odeakin@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20090225155127.7CD19238889F@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org 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)