Mercurial Mercurial > jdk-sandbox / diff
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
common/autoconf/generated-configure.sh
changeset 14467 a973c0a1bd5d
parent 14465 d529faf5e36a
child 14562 ab12d5824d04 
--- a/common/autoconf/generated-configure.sh	Wed Nov 28 13:40:17 2012 +0100
+++ b/common/autoconf/generated-configure.sh	Wed Nov 28 13:48:36 2012 +0100
@@ -3672,7 +3672,7 @@
 #CUSTOM_AUTOCONF_INCLUDE
 
 # Do not change or remove the following line, it is needed for consistency checks:
-DATE_WHEN_GENERATED=1354104798
+DATE_WHEN_GENERATED=1354106772
 
 ###############################################################################
 #
@@ -27585,9 +27585,11 @@
                     -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
+    # Add server first if available. Linking aginst client does not always produce the same results.
+    # Only add client dir if client is being built. Default to server for other variants.
+    if test "x$JVM_VARIANT_SERVER" = xtrue; then
+        LDFLAGS_JDKLIB="${LDFLAGS_JDKLIB} -L${JDK_OUTPUTDIR}/lib${OPENJDK_TARGET_CPU_LIBDIR}/server"
+    elif 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"
jdk-sandbox