1.1 --- a/common/autoconf/toolchain.m4 Mon Nov 19 14:06:30 2012 -0800
1.2 +++ b/common/autoconf/toolchain.m4 Wed Nov 28 13:15:56 2012 +0100
1.3 @@ -938,10 +938,17 @@
1.4 fi
1.5 fi
1.6 LDFLAGS_JDKLIB="${LDFLAGS_JDK} $SHARED_LIBRARY_FLAGS \
1.7 - -L${JDK_OUTPUTDIR}/lib${OPENJDK_TARGET_CPU_LIBDIR}/server \
1.8 - -L${JDK_OUTPUTDIR}/lib${OPENJDK_TARGET_CPU_LIBDIR}/client \
1.9 -L${JDK_OUTPUTDIR}/lib${OPENJDK_TARGET_CPU_LIBDIR}"
1.10
1.11 + # On some platforms (mac) the linker warns about non existing -L dirs.
1.12 + # Only add client dir if client is being built. Otherwise server should
1.13 + # be enough
1.14 + if test "x$JVM_VARIANT_CLIENT" = xtrue; then
1.15 + LDFLAGS_JDKLIB="${LDFLAGS_JDKLIB} -L${JDK_OUTPUTDIR}/lib${OPENJDK_TARGET_CPU_LIBDIR}/client"
1.16 + else
1.17 + LDFLAGS_JDKLIB="${LDFLAGS_JDKLIB} -L${JDK_OUTPUTDIR}/lib${OPENJDK_TARGET_CPU_LIBDIR}/server"
1.18 + fi
1.19 +
1.20 LDFLAGS_JDKLIB_SUFFIX="-ljava -ljvm"
1.21 if test "x$COMPILER_NAME" = xossc; then
1.22 LDFLAGS_JDKLIB_SUFFIX="$LDFLAGS_JDKLIB_SUFFIX -lc"
