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 14:32:49 UTC
svn commit: r517695 - in /harmony/enhanced/classlib/trunk/depends/build:
defines.mk rules.mk
Author: hindessm
Date: Tue Mar 13 06:32:48 2007
New Revision: 517695
URL: http://svn.apache.org/viewvc?view=rev&rev=517695
Log:
More makefile refactoring to support a non-gcc toolchain.
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=517695&r1=517694&r2=517695
==============================================================================
--- harmony/enhanced/classlib/trunk/depends/build/defines.mk (original)
+++ harmony/enhanced/classlib/trunk/depends/build/defines.mk Tue Mar 13 06:32:48 2007
@@ -33,6 +33,10 @@
XLIBS = -L/usr/X11R6/lib -lX11 -lXft
MDLLIBPREFIX = -Xlinker --start-group
MDLLIBSUFFIX = -Xlinker --end-group
+EXELDFLAGS = $(LDFLAGS)
+EXERPATHPREFIX = -Xlinker -z -Xlinker origin -Xlinker -rpath \
+ -Xlinker \$$ORIGIN/ -Xlinker -rpath-link \
+ -Xlinker
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=517695&r1=517694&r2=517695
==============================================================================
--- harmony/enhanced/classlib/trunk/depends/build/rules.mk (original)
+++ harmony/enhanced/classlib/trunk/depends/build/rules.mk Tue Mar 13 06:32:48 2007
@@ -38,20 +38,18 @@
endif
$(DLLNAME): $(BUILDFILES) $(MDLLIBFILES) $(EXPFILE)
- $(DLL_LD) -shared -Wl,--version-script,$(EXPFILE) $(LDFLAGS) \
- -Wl,-soname=$(@F) $(VMLINK) -o $@ \
+ $(DLL_LD) -shared -Wl,-soname=$(@F) -Wl,--version-script,$(EXPFILE) \
+ $(LDFLAGS) $(VMLINK) -o $@ \
$(BUILDFILES) \
$(MDLLIBPREFIX) $(MDLLIBFILES) $(MDLLIBSUFFIX) \
$(OSLIBS)
$(EXENAME): $(BUILDFILES) $(MDLLIBFILES)
- $(CC) $(VMLINK) $(LDFLAGS) \
+ $(CC) $(VMLINK) $(EXELDFLAGS) \
$(BUILDFILES) \
$(MDLLIBPREFIX) $(MDLLIBFILES) $(MDLLIBSUFFIX) \
-o $@ $(OSLIBS) \
- -Xlinker -z -Xlinker origin \
- -Xlinker -rpath -Xlinker \$$ORIGIN/ \
- -Xlinker -rpath-link -Xlinker $(HY_HDK)/jdk/jre/bin
+ $(EXERPATHPREFIX) -L$(HY_HDK)/jdk/jre/bin
clean:
-rm -f $(BUILDFILES) $(DLLNAME) $(EXENAME) $(LIBNAME) $(EXPFILE) \