Sun, 30 Dec 2012 12:15:02 +0100
8004490: build-infra: mac: hotspot is always built in product, regardless of --with-debug-level setting
Reviewed-by: tbell
common/autoconf/generated-configure.sh | file | annotate | diff | comparison | revisions | |
common/autoconf/jdk-options.m4 | file | annotate | diff | comparison | revisions |
1.1 --- a/common/autoconf/generated-configure.sh Fri Dec 28 09:51:15 2012 +0100 1.2 +++ b/common/autoconf/generated-configure.sh Sun Dec 30 12:15:02 2012 +0100 1.3 @@ -3679,7 +3679,7 @@ 1.4 #CUSTOM_AUTOCONF_INCLUDE 1.5 1.6 # Do not change or remove the following line, it is needed for consistency checks: 1.7 -DATE_WHEN_GENERATED=1356638459 1.8 +DATE_WHEN_GENERATED=1356865941 1.9 1.10 ############################################################################### 1.11 # 1.12 @@ -7580,7 +7580,7 @@ 1.13 # from configure, but only server is valid anyway. Fix this 1.14 # when hotspot makefiles are rewritten. 1.15 if test "x$MACOSX_UNIVERSAL" = xtrue; then 1.16 - HOTSPOT_TARGET=universal_product 1.17 + HOTSPOT_TARGET=universal_${HOTSPOT_EXPORT} 1.18 fi 1.19 1.20 #####
2.1 --- a/common/autoconf/jdk-options.m4 Fri Dec 28 09:51:15 2012 +0100 2.2 +++ b/common/autoconf/jdk-options.m4 Sun Dec 30 12:15:02 2012 +0100 2.3 @@ -235,7 +235,7 @@ 2.4 # from configure, but only server is valid anyway. Fix this 2.5 # when hotspot makefiles are rewritten. 2.6 if test "x$MACOSX_UNIVERSAL" = xtrue; then 2.7 - HOTSPOT_TARGET=universal_product 2.8 + HOTSPOT_TARGET=universal_${HOTSPOT_EXPORT} 2.9 fi 2.10 2.11 #####