Mercurial > hg > release > icedtea7-forest-2.0 > jdk
changeset 4542:d442c8a1bbc4
Always use OTHER_LDLIBS to specify libraries to link against, not LDFLAGS.
| author | andrew |
|---|---|
| date | Fri, 02 Sep 2011 06:41:37 +0100 |
| parents | 95946d35b704 |
| children | ce8a1a41df89 |
| files | make/com/sun/java/pack/Makefile make/common/Program.gmk make/javax/sound/jsoundalsa/Makefile |
| diffstat | 3 files changed, 5 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/make/com/sun/java/pack/Makefile Wed Aug 31 04:43:06 2011 +0100 +++ b/make/com/sun/java/pack/Makefile Fri Sep 02 06:41:37 2011 +0100 @@ -74,7 +74,7 @@ ifdef USE_SYSTEM_ZLIB OTHER_CXXFLAGS += $(ZLIB_CFLAGS) -DUSE_SYSTEM_ZLIB=1 - LDDFLAGS += $(ZLIB_LIBS) + OTHER_LDLIBS += $(ZLIB_LIBS) else ZINCLUDE=-I$(SHARE_SRC)/native/java/util/zip/zlib-$(ZLIB_VERSION) OTHER_CXXFLAGS += $(ZINCLUDE) @@ -101,8 +101,7 @@ RES = $(OBJDIR)/$(PGRM).res else LDOUTPUT = -o #Have a space - LDDFLAGS += -lc - OTHER_LDLIBS += $(LIBCXX) + OTHER_LDLIBS += -lc $(LIBCXX) # setup the list of libraries to link in... ifeq ($(PLATFORM), linux) ifeq ("$(CC_VER_MAJOR)", "3") @@ -159,7 +158,7 @@ $(prep-target) $(RM) $(TEMPDIR)/mapfile-vers $(CP) mapfile-vers-unpack200 $(TEMPDIR)/mapfile-vers - $(LINKER) $(LDDFLAGS) $(UNPACK_EXE_FILES_o) $(RES) $(LIBCXX) $(LDOUTPUT)$(TEMPDIR)/unpack200$(EXE_SUFFIX) + $(LINKER) $(LDDFLAGS) $(UNPACK_EXE_FILES_o) $(RES) $(OTHER_LDLIBS) $(LDOUTPUT)$(TEMPDIR)/unpack200$(EXE_SUFFIX) ifdef MT $(MT) /manifest $(OBJDIR)/unpack200$(EXE_SUFFIX).manifest /outputresource:$(TEMPDIR)/unpack200$(EXE_SUFFIX);#1 endif
--- a/make/common/Program.gmk Wed Aug 31 04:43:06 2011 +0100 +++ b/make/common/Program.gmk Fri Sep 02 06:41:37 2011 +0100 @@ -94,7 +94,7 @@ endif ifeq ($(PLATFORM), linux) ifdef USE_SYSTEM_ZLIB - LDFLAGS += $(ZLIB_LIBS) + OTHER_LDLIBS += $(ZLIB_LIBS) endif LDFLAGS += $(LDFLAG_Z_ORIGIN) LDFLAGS += -Wl,--allow-shlib-undefined