Mercurial > hg > release > icedtea7-forest-2.0 > jdk
changeset 4538:3cb9c8dc1cdc
Don't link against libdl when not needed
| author | andrew |
|---|---|
| date | Wed, 24 Aug 2011 06:43:33 +0100 |
| parents | 8008e5233d16 |
| children | a66317d3a7fe |
| files | make/java/net/Makefile make/sun/awt/Makefile make/sun/awt/mawt.gmk |
| diffstat | 3 files changed, 6 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/make/java/net/Makefile Wed Aug 24 04:53:54 2011 +0100 +++ b/make/java/net/Makefile Wed Aug 24 06:43:33 2011 +0100 @@ -100,7 +100,7 @@ secur32.lib iphlpapi.lib delayimp.lib \ /DELAYLOAD:secur32.dll /DELAYLOAD:iphlpapi.dll else - OTHER_LDLIBS = $(LIBSOCKET) $(LIBNSL) -ldl $(JVMLIB) + OTHER_LDLIBS = $(LIBSOCKET) $(LIBNSL) $(JVMLIB) endif ifeq ($(PLATFORM), linux) OTHER_LDLIBS += -lpthread @@ -111,6 +111,7 @@ CPPFLAGS += $(GCONF_CFLAGS) $(GOBJECT_CFLAGS) -DUSE_SYSTEM_GCONF else CPPFLAGS += -I$(PLATFORM_SRC)/native/common/deps/gconf2 + OTHER_LDLIBS += -ldl endif CLASSES.export += java.lang.Integer java.io.FileDescriptor java.net.InetAddressImplFactory java.net.Inet4AddressImpl java.net.Inet6AddressImpl
--- a/make/sun/awt/Makefile Wed Aug 24 04:53:54 2011 +0100 +++ b/make/sun/awt/Makefile Wed Aug 24 06:43:33 2011 +0100 @@ -136,7 +136,7 @@ FILES_s += mlib_v_ImageCopy_blk.s INLINE_VIS = $(PLATFORM_SRC)/native/sun/awt/medialib/vis_$(ARCH_DATA_MODEL).il CFLAGS_sparcv9 = -DMLIB_OS64BIT - + CFLAGS += $(CFLAGS_$(ARCH)) -DMLIB_ADD_SUFF $(INLINE_VIS) \ -I$(SHARE_SRC)/native/sun/awt/medialib \ -I$(PLATFORM_SRC)/native/sun/awt/medialib \
--- a/make/sun/awt/mawt.gmk Wed Aug 24 04:53:54 2011 +0100 +++ b/make/sun/awt/mawt.gmk Wed Aug 24 06:43:33 2011 +0100 @@ -184,10 +184,12 @@ # !HEADLESS OTHER_LDLIBS += $(JVMLIB) $(LIBCXX) \ - -lawt $(LIBM) -ldl + -lawt $(LIBM) ifdef USE_SYSTEM_FONTCONFIG OTHER_LDLIBS += $(FONTCONFIG_LIBS) +else + OTHER_LDLIBS += -ldl endif #