Return-Path: Delivered-To: apmail-harmony-commits-archive@www.apache.org Received: (qmail 34719 invoked from network); 18 Jan 2007 20:44:07 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 18 Jan 2007 20:44:07 -0000 Received: (qmail 45738 invoked by uid 500); 18 Jan 2007 20:44:13 -0000 Delivered-To: apmail-harmony-commits-archive@harmony.apache.org Received: (qmail 45722 invoked by uid 500); 18 Jan 2007 20:44:13 -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 45713 invoked by uid 99); 18 Jan 2007 20:44:13 -0000 Received: from herse.apache.org (HELO herse.apache.org) (140.211.11.133) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 18 Jan 2007 12:44:13 -0800 X-ASF-Spam-Status: No, hits=-9.4 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 18 Jan 2007 12:44:05 -0800 Received: by eris.apache.org (Postfix, from userid 65534) id DCD5B1A981A; Thu, 18 Jan 2007 12:43:00 -0800 (PST) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r497565 - in /harmony/enhanced/classlib/trunk/depends/build: defines.mk platform/freebsd.x86.mk rules.mk Date: Thu, 18 Jan 2007 20:43:00 -0000 To: commits@harmony.apache.org From: hindessm@apache.org X-Mailer: svnmailer-1.1.0 Message-Id: <20070118204300.DCD5B1A981A@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: hindessm Date: Thu Jan 18 12:42:59 2007 New Revision: 497565 URL: http://svn.apache.org/viewvc?view=rev&rev=497565 Log: More flexibility for OS libraries in make rules. Modified: harmony/enhanced/classlib/trunk/depends/build/defines.mk harmony/enhanced/classlib/trunk/depends/build/platform/freebsd.x86.mk harmony/enhanced/classlib/trunk/depends/build/rules.mk Modified: harmony/enhanced/classlib/trunk/depends/build/defines.mk URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/depends/build/defines.mk?view=diff&rev=497565&r1=497564&r2=497565 ============================================================================== --- harmony/enhanced/classlib/trunk/depends/build/defines.mk (original) +++ harmony/enhanced/classlib/trunk/depends/build/defines.mk Thu Jan 18 12:42:59 2007 @@ -23,7 +23,7 @@ AR = ar DLL_LD = $(CC) CXX_DLL_LD = $(CXX) -OSLIBS = +OSLIBS = -lc -lm include $(HY_HDK)/build/make/platform/$(HY_PLATFORM).mk Modified: harmony/enhanced/classlib/trunk/depends/build/platform/freebsd.x86.mk URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/depends/build/platform/freebsd.x86.mk?view=diff&rev=497565&r1=497564&r2=497565 ============================================================================== --- harmony/enhanced/classlib/trunk/depends/build/platform/freebsd.x86.mk (original) +++ harmony/enhanced/classlib/trunk/depends/build/platform/freebsd.x86.mk Thu Jan 18 12:42:59 2007 @@ -15,3 +15,4 @@ DEFINES += -DFREEBSD -DFREEBSD_X86 -DHYX86 -DNEEDS_SYS_TYPES OPT += -march=pentium3 +OSLIBS = -lc_r -lm Modified: harmony/enhanced/classlib/trunk/depends/build/rules.mk URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/depends/build/rules.mk?view=diff&rev=497565&r1=497564&r2=497565 ============================================================================== --- harmony/enhanced/classlib/trunk/depends/build/rules.mk (original) +++ harmony/enhanced/classlib/trunk/depends/build/rules.mk Thu Jan 18 12:42:59 2007 @@ -30,13 +30,13 @@ -Wl,-soname=$(@F) $(VMLINK) -o $@ \ $(BUILDFILES) $(SYSLIBFILES) \ -Xlinker --start-group $(MDLLIBFILES) -Xlinker --end-group \ - -lc -lm $(OSLIBS) + $(OSLIBS) $(EXENAME): $(BUILDFILES) $(MDLLIBFILES) $(CC) $(VMLINK) $(LDFLAGS) \ $(BUILDFILES) \ -Xlinker --start-group $(MDLLIBFILES) -Xlinker --end-group \ - -o $@ -lm -lpthread -lc $(OSLIBS) \ + -o $@ $(OSLIBS) \ -Xlinker -z -Xlinker origin \ -Xlinker -rpath -Xlinker \$$ORIGIN/ \ -Xlinker -rpath-link -Xlinker $(HY_HDK)/jdk/jre/bin