infernap12/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2026-02-22 16:26:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

8001460: build-infra: Linker warnings on macosx

Browse Source 
Only linking against jvm variant specific dirs if they are expected to exist.

Reviewed-by: ohair
This commit is contained in:
Erik Joelsson 2012-11-28 13:15:56 +01:00
parent 4850bec745
commit fb43b09f46
2 changed files with 4165 additions and 7032 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11186
common/autoconf/generated-configure.sh
View File

File diff suppressed because it is too large Load Diff

11
common/autoconf/toolchain.m4
View File

@ -938,10 +938,17 @@ else
fi
fi
LDFLAGS_JDKLIB="${LDFLAGS_JDK} $SHARED_LIBRARY_FLAGS \
-L${JDK_OUTPUTDIR}/lib${OPENJDK_TARGET_CPU_LIBDIR}/server \
-L${JDK_OUTPUTDIR}/lib${OPENJDK_TARGET_CPU_LIBDIR}/client \
-L${JDK_OUTPUTDIR}/lib${OPENJDK_TARGET_CPU_LIBDIR}"
# On some platforms (mac) the linker warns about non existing -L dirs.
# Only add client dir if client is being built. Otherwise server should
# be enough
if test "x$JVM_VARIANT_CLIENT" = xtrue; then
LDFLAGS_JDKLIB="${LDFLAGS_JDKLIB} -L${JDK_OUTPUTDIR}/lib${OPENJDK_TARGET_CPU_LIBDIR}/client"
else
LDFLAGS_JDKLIB="${LDFLAGS_JDKLIB} -L${JDK_OUTPUTDIR}/lib${OPENJDK_TARGET_CPU_LIBDIR}/server"
fi
LDFLAGS_JDKLIB_SUFFIX="-ljava -ljvm"
if test "x$COMPILER_NAME" = xossc; then
LDFLAGS_JDKLIB_SUFFIX="$LDFLAGS_JDKLIB_SUFFIX -lc"