OpenJDK / jdk / hs
changeset 23985:39f417e8c59f
8007327: Emit MEMORY_SIZE into spec.gmk
Reviewed-by: erikj
| author | mduigou |
|---|---|
| date | Tue, 22 Apr 2014 12:56:41 -0700 |
| parents | e3e90595a176 |
| children | 1809fb8266cb |
| files | common/autoconf/build-performance.m4 common/autoconf/generated-configure.sh common/autoconf/spec.gmk.in |
| diffstat | 3 files changed, 5 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/common/autoconf/build-performance.m4 Tue Apr 22 12:55:56 2014 -0700 +++ b/common/autoconf/build-performance.m4 Tue Apr 22 12:56:41 2014 -0700 @@ -89,7 +89,7 @@ if test "x$FOUND_MEM" = xyes; then AC_MSG_RESULT([$MEMORY_SIZE MB]) else - AC_MSG_RESULT([could not detect memory size, defaulting to 1024 MB]) + AC_MSG_RESULT([could not detect memory size, defaulting to $MEMORY_SIZE MB]) AC_MSG_WARN([This might seriously impact build performance!]) fi ])
--- a/common/autoconf/generated-configure.sh Tue Apr 22 12:55:56 2014 -0700 +++ b/common/autoconf/generated-configure.sh Tue Apr 22 12:56:41 2014 -0700 @@ -4243,7 +4243,7 @@ #CUSTOM_AUTOCONF_INCLUDE # Do not change or remove the following line, it is needed for consistency checks: -DATE_WHEN_GENERATED=1398168727 +DATE_WHEN_GENERATED=1398196583 ############################################################################### # @@ -48567,8 +48567,8 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MEMORY_SIZE MB" >&5 $as_echo "$MEMORY_SIZE MB" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: could not detect memory size, defaulting to 1024 MB" >&5 -$as_echo "could not detect memory size, defaulting to 1024 MB" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: could not detect memory size, defaulting to $MEMORY_SIZE MB" >&5 +$as_echo "could not detect memory size, defaulting to $MEMORY_SIZE MB" >&6; } { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: This might seriously impact build performance!" >&5 $as_echo "$as_me: WARNING: This might seriously impact build performance!" >&2;} fi
--- a/common/autoconf/spec.gmk.in Tue Apr 22 12:55:56 2014 -0700 +++ b/common/autoconf/spec.gmk.in Tue Apr 22 12:56:41 2014 -0700 @@ -261,6 +261,7 @@ # Information about the build system NUM_CORES:=@NUM_CORES@ +MEMORY_SIZE:=@MEMORY_SIZE@ # Enable sjavac support = use a javac server, # multi core javac compilation and dependency tracking. ENABLE_SJAVAC:=@ENABLE_SJAVAC@