harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hinde...@apache.org
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 GMT
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



Mime
View raw message