# HG changeset patch # User erikj # Date 1356866102 -3600 # Node ID 2d9bb72b4e34003fbe3aef7b480a9056fd893a43 # Parent ef6adbf511ccdc04187862ef88325fda8aa6c58c 8004490: build-infra: mac: hotspot is always built in product, regardless of --with-debug-level setting Reviewed-by: tbell diff -r ef6adbf511cc -r 2d9bb72b4e34 common/autoconf/generated-configure.sh --- a/common/autoconf/generated-configure.sh Fri Dec 28 09:51:15 2012 +0100 +++ b/common/autoconf/generated-configure.sh Sun Dec 30 12:15:02 2012 +0100 @@ -3679,7 +3679,7 @@ #CUSTOM_AUTOCONF_INCLUDE # Do not change or remove the following line, it is needed for consistency checks: -DATE_WHEN_GENERATED=1356638459 +DATE_WHEN_GENERATED=1356865941 ############################################################################### # @@ -7580,7 +7580,7 @@ # from configure, but only server is valid anyway. Fix this # when hotspot makefiles are rewritten. if test "x$MACOSX_UNIVERSAL" = xtrue; then - HOTSPOT_TARGET=universal_product + HOTSPOT_TARGET=universal_${HOTSPOT_EXPORT} fi ##### diff -r ef6adbf511cc -r 2d9bb72b4e34 common/autoconf/jdk-options.m4 --- a/common/autoconf/jdk-options.m4 Fri Dec 28 09:51:15 2012 +0100 +++ b/common/autoconf/jdk-options.m4 Sun Dec 30 12:15:02 2012 +0100 @@ -235,7 +235,7 @@ # from configure, but only server is valid anyway. Fix this # when hotspot makefiles are rewritten. if test "x$MACOSX_UNIVERSAL" = xtrue; then - HOTSPOT_TARGET=universal_product + HOTSPOT_TARGET=universal_${HOTSPOT_EXPORT} fi #####