Mercurial > hg > openjdk > lambda > jdk
changeset 7496:fb7e3edf22b2
8008294: build-infra: Build-infra closed fails on solaris 11.1
Reviewed-by: ohrstrom, dholmes, tbell
| author | erikj |
|---|---|
| date | Mon, 18 Feb 2013 11:26:23 +0100 |
| parents | 9a693ebd5595 |
| children | a23b0df73324 |
| files | makefiles/CompileDemos.gmk makefiles/CompileNativeLibraries.gmk |
| diffstat | 2 files changed, 4 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/makefiles/CompileDemos.gmk Mon Feb 18 10:48:51 2013 +0100 +++ b/makefiles/CompileDemos.gmk Mon Feb 18 11:26:23 2013 +0100 @@ -421,6 +421,7 @@ CFLAGS:=$(CFLAGS_JDKLIB) $(SHARED_LIBRARY_FLAGS) \ -I$(JDK_OUTPUTDIR)/democlasses/jni/Poller, \ LDFLAGS:=$(LDFLAGS_JDKLIB), \ + LDFLAGS_SUFFIX_solaris:=-lc,\ OBJECT_DIR:=$(JDK_OUTPUTDIR)/demoobjs/jni/Poller,\ OUTPUT_DIR:=$(JDK_OUTPUTDIR)/demoobjs, \ LIBRARY:=Poller))
--- a/makefiles/CompileNativeLibraries.gmk Mon Feb 18 10:48:51 2013 +0100 +++ b/makefiles/CompileNativeLibraries.gmk Mon Feb 18 11:26:23 2013 +0100 @@ -2188,6 +2188,7 @@ MAPFILE:=$(JDK_TOPDIR)/makefiles/mapfiles/libjfr/mapfile-vers, \ LDFLAGS:=$(LDFLAGS_JDKLIB) \ $(call SET_SHARED_LIBRARY_ORIGIN),\ + LDFLAGS_SUFFIX_solaris:=-lc,\ VERSIONINFO_RESOURCE:=$(JDK_TOPDIR)/src/windows/resource/version.rc,\ RC_FLAGS:=$(RC_FLAGS)\ -D "JDK_FNAME=jfr.dll" \ @@ -2236,6 +2237,7 @@ LDFLAGS:=$(LDFLAGS_JDKLIB) \ $(call SET_SHARED_LIBRARY_ORIGIN),\ LDFLAGS_SUFFIX_linux:=-lc -lpthread,\ + LDFLAGS_SUFFIX_solaris:=-lc,\ LDFLAGS_SUFFIX_windows:=$(WIN_JAVA_LIB) advapi32.lib user32.lib version.lib, \ LDFLAGS_SUFFIX_posix:=-lm -ljava -ljvm,\ VERSIONINFO_RESOURCE:=$(JDK_TOPDIR)/src/closed/share/native/sun/java2d/cmm/kcms/cmm.rc,\ @@ -2939,6 +2941,7 @@ MAPFILE:=$(JDK_TOPDIR)/makefiles/mapfiles/libj2ucrypto/mapfile-vers, \ LDFLAGS:=$(LDFLAGS_JDKLIB),\ LDFLAGS_SUFFIX:=$(LIBDL),\ + LDFLAGS_SUFFIX_solaris:=-lc,\ OBJECT_DIR:=$(JDK_OUTPUTDIR)/objs/libj2ucrypto)) $(BUILD_LIBJ2UCRYPTO) : $(BUILD_LIBJAVA)