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

Posted to commits@harmony.apache.org by hi...@apache.org on 2007/03/13 10:43:51 UTC

svn commit: r517616 - in /harmony/enhanced/classlib/trunk/depends/build: defines.mk rules.mk

Author: hindessm
Date: Tue Mar 13 02:43:50 2007
New Revision: 517616

URL: http://svn.apache.org/viewvc?view=rev&rev=517616
Log:
Make build rules more flexible for different tool chains.

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=517616&r1=517615&r2=517616
==============================================================================
--- harmony/enhanced/classlib/trunk/depends/build/defines.mk (original)
+++ harmony/enhanced/classlib/trunk/depends/build/defines.mk Tue Mar 13 02:43:50 2007
@@ -31,6 +31,8 @@
 STDCLIBS = -lstdc++
 OSLIBS = -lc -lm
 XLIBS = -L/usr/X11R6/lib -lX11 -lXft
+MDLLIBPREFIX = -Xlinker --start-group
+MDLLIBSUFFIX = -Xlinker --end-group
 
 include $(HY_HDK)/build/make/platform/$(HY_PLATFORM).mk
 

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=517616&r1=517615&r2=517616
==============================================================================
--- harmony/enhanced/classlib/trunk/depends/build/rules.mk (original)
+++ harmony/enhanced/classlib/trunk/depends/build/rules.mk Tue Mar 13 02:43:50 2007
@@ -41,13 +41,13 @@
 	$(DLL_LD) -shared -Wl,--version-script,$(EXPFILE) $(LDFLAGS) \
 	-Wl,-soname=$(@F) $(VMLINK) -o $@ \
 	$(BUILDFILES) \
-	-Xlinker --start-group $(MDLLIBFILES) -Xlinker --end-group \
+	$(MDLLIBPREFIX) $(MDLLIBFILES) $(MDLLIBSUFFIX) \
 	$(OSLIBS)
 
 $(EXENAME): $(BUILDFILES) $(MDLLIBFILES)
 	$(CC) $(VMLINK) $(LDFLAGS) \
 	$(BUILDFILES) \
-	-Xlinker --start-group $(MDLLIBFILES) -Xlinker --end-group \
+	$(MDLLIBPREFIX) $(MDLLIBFILES) $(MDLLIBSUFFIX) \
 	-o $@ $(OSLIBS) \
 	-Xlinker -z -Xlinker origin \
 	-Xlinker -rpath -Xlinker \$$ORIGIN/ \