harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hinde...@apache.org
Subject svn commit: r482736 - in /harmony/enhanced/classlib/trunk/depends/build: defines.mk rules.mk
Date Tue, 05 Dec 2006 18:46:50 GMT
Author: hindessm
Date: Tue Dec  5 10:46:48 2006
New Revision: 482736

URL: http://svn.apache.org/viewvc?view=rev&rev=482736
Log:
FreeBSD doesn't have -ldl.  There must be a better way to do this.

Modified:
    harmony/enhanced/classlib/trunk/depends/build/defines.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=482736&r1=482735&r2=482736
==============================================================================
--- harmony/enhanced/classlib/trunk/depends/build/defines.mk (original)
+++ harmony/enhanced/classlib/trunk/depends/build/defines.mk Tue Dec  5 10:46:48 2006
@@ -23,8 +23,13 @@
 AR = ar
 DLL_LD = $(CC)
 CXX_DLL_LD = $(CXX)
+OSLIBS =
 
 include $(HY_HDK)/build/make/platform/$(HY_PLATFORM).mk
+
+ifneq ($(HY_OS),freebsd)
+OSLIBS += -ldl
+endif
 
 EXEPATH=../
 LIBPATH=$(HY_HDK)/lib/

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=482736&r1=482735&r2=482736
==============================================================================
--- harmony/enhanced/classlib/trunk/depends/build/rules.mk (original)
+++ harmony/enhanced/classlib/trunk/depends/build/rules.mk Tue Dec  5 10:46:48 2006
@@ -29,13 +29,13 @@
 	-Wl,-soname=$(@F) $(VMLINK) -o $@ \
 	$(BUILDFILES) $(SYSLIBFILES) \
 	-Xlinker --start-group $(MDLLIBFILES) -Xlinker --end-group \
-	-lc -lm -ldl $(LDFLAGS)
+	-lc -lm $(OSLIBS) $(LDFLAGS)
 
 $(EXENAME): $(BUILDFILES) $(MDLLIBFILES)
 	$(CC) $(VMLINK) \
 	$(BUILDFILES) \
 	-Xlinker --start-group $(MDLLIBFILES) -Xlinker --end-group \
-	-o $@ -lm -lpthread -lc -ldl \
+	-o $@ -lm -lpthread -lc $(OSLIBS) \
 	-Xlinker -z -Xlinker origin \
 	-Xlinker -rpath -Xlinker \$$ORIGIN/ \
 	-Xlinker -rpath-link -Xlinker $(HY_HDK)/jdk/jre/bin



Mime
View raw message