1.1 --- a/common/autoconf/toolchain.m4 Wed Dec 19 13:36:21 2012 -0800
1.2 +++ b/common/autoconf/toolchain.m4 Thu Dec 20 01:44:02 2012 -0500
1.3 @@ -954,11 +954,14 @@
1.4
1.5 # On some platforms (mac) the linker warns about non existing -L dirs.
1.6 # Add server first if available. Linking aginst client does not always produce the same results.
1.7 - # Only add client dir if client is being built. Default to server for other variants.
1.8 + # Only add client dir if client is being built. Add minimal (note not minimal1) if only building minimal1.
1.9 + # Default to server for other variants.
1.10 if test "x$JVM_VARIANT_SERVER" = xtrue; then
1.11 LDFLAGS_JDKLIB="${LDFLAGS_JDKLIB} -L${JDK_OUTPUTDIR}/lib${OPENJDK_TARGET_CPU_LIBDIR}/server"
1.12 elif test "x$JVM_VARIANT_CLIENT" = xtrue; then
1.13 LDFLAGS_JDKLIB="${LDFLAGS_JDKLIB} -L${JDK_OUTPUTDIR}/lib${OPENJDK_TARGET_CPU_LIBDIR}/client"
1.14 + elif test "x$JVM_VARIANT_MINIMAL1" = xtrue; then
1.15 + LDFLAGS_JDKLIB="${LDFLAGS_JDKLIB} -L${JDK_OUTPUTDIR}/lib${OPENJDK_TARGET_CPU_LIBDIR}/minimal"
1.16 else
1.17 LDFLAGS_JDKLIB="${LDFLAGS_JDKLIB} -L${JDK_OUTPUTDIR}/lib${OPENJDK_TARGET_CPU_LIBDIR}/server"
1.18 fi
