]>
Commit | Line | Data |
---|---|---|
0fa4da98 JP |
1 | # DP: Fix build failures with -Wl,--as-needed, don't explicitly link with -lc |
2 | ||
3 | --- a/jdk/make/CompileLaunchers.gmk | |
4 | +++ b/jdk/make/CompileLaunchers.gmk | |
5 | @@ -464,7 +464,7 @@ endif | |
6 | # binary (at least on linux) which causes the size to differ between old and new build. | |
7 | ifeq ($(USE_EXTERNAL_LIBZ), true) | |
8 | UNPACKEXE_CFLAGS := -DSYSTEM_ZLIB | |
9 | - UNPACKEXE_ZIPOBJS := -lz | |
10 | + UNPACKEXE_LIBS := -lz | |
11 | else | |
12 | UNPACKEXE_CFLAGS := -I$(JDK_TOPDIR)/src/share/native/java/util/zip/zlib | |
13 | UNPACKEXE_ZIPOBJS := $(JDK_OUTPUTDIR)/objs/libzip/zcrc32$(OBJ_SUFFIX) \ | |
14 | @@ -524,9 +524,9 @@ $(eval $(call SetupNativeCompilation,BUI | |
15 | LDFLAGS_posix := $(LDFLAGS_JDKEXE) $(LDFLAGS_CXX_JDK) \ | |
16 | $(call SET_SHARED_LIBRARY_NAME,$(LIBRARY_PREFIX)unpack$(SHARED_LIBRARY_SUFFIX)) \ | |
17 | $(call SET_SHARED_LIBRARY_ORIGIN), \ | |
18 | - LDFLAGS_linux := -lc, \ | |
19 | + LDFLAGS_linux := , \ | |
20 | LDFLAGS_solaris := $(UNPACKEXE_LDFLAGS_solaris) -lc, \ | |
21 | - LDFLAGS_SUFFIX := $(LIBCXX), \ | |
22 | + LDFLAGS_SUFFIX := $(UNPACKEXE_LIBS) $(LIBCXX), \ | |
23 | OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/unpackexe$(OUTPUT_SUBDIR), \ | |
24 | OUTPUT_DIR := $(JDK_OUTPUTDIR)/objs/unpackexe$(OUTPUT_SUBDIR), \ | |
25 | PROGRAM := unpack200, \ | |
26 | --- a/jdk/make/lib/Awt2dLibraries.gmk | |
27 | +++ b/jdk/make/lib/Awt2dLibraries.gmk | |
28 | @@ -759,10 +759,10 @@ $(eval $(call SetupNativeCompilation,BUI | |
29 | $(BUILD_LIBJAVAJPEG_CLOSED_INCLUDES) \ | |
30 | $(BUILD_LIBJAVAJPEG_HEADERS), \ | |
31 | MAPFILE := $(BUILD_LIBJAVAJPEG_MAPFILE), \ | |
32 | - LDFLAGS := $(LDFLAGS_JDKLIB) $(LIBJPEG_LIBS) \ | |
33 | + LDFLAGS := $(LDFLAGS_JDKLIB) \ | |
34 | $(call SET_SHARED_LIBRARY_ORIGIN), \ | |
35 | LDFLAGS_windows := $(WIN_JAVA_LIB) jvm.lib, \ | |
36 | - LDFLAGS_SUFFIX := $(LDFLAGS_JDKLIB_SUFFIX), \ | |
37 | + LDFLAGS_SUFFIX := $(LIBJPEG_LIBS) $(LDFLAGS_JDKLIB_SUFFIX), \ | |
38 | VERSIONINFO_RESOURCE := $(JDK_TOPDIR)/src/windows/resource/version.rc, \ | |
39 | RC_FLAGS := $(RC_FLAGS) \ | |
40 | -D "JDK_FNAME=javajpeg.dll" \ |