提交 0533a6a2 编写于 作者: S schien

6903609: Max memory of 896 may be too large for typical windows developer environment

Reviewed-by: ksrini, katleman
上级 899f87d6
...@@ -428,8 +428,6 @@ endif ...@@ -428,8 +428,6 @@ endif
# Machines with 512Mb or less of real memory are considered low memory # Machines with 512Mb or less of real memory are considered low memory
# build machines and adjustments will be made to prevent excessing # build machines and adjustments will be made to prevent excessing
# system swapping during the build. # system swapping during the build.
# If we don't know, assume 512. Subtract 128 from MB for VM MAX.
# Don't set VM max over 1024-128=896.
ifeq ($(JDK_HAS_MEM_INFO),) ifeq ($(JDK_HAS_MEM_INFO),)
JDK_HAS_MEM_INFO=true JDK_HAS_MEM_INFO=true
export JDK_HAS_MEM_INFO export JDK_HAS_MEM_INFO
...@@ -440,18 +438,8 @@ ifeq ($(JDK_HAS_MEM_INFO),) ...@@ -440,18 +438,8 @@ ifeq ($(JDK_HAS_MEM_INFO),)
else \ else \
echo "false"; \ echo "false"; \
fi) fi)
MAX_VM_MEMORY := $(shell \ MAX_VM_MEMORY := 512
if [ $(MB_OF_MEMORY) -le 1024 ] ; then \ MIN_VM_MEMORY := $(MAX_VM_MEMORY)
expr $(MB_OF_MEMORY) '-' 128 2> $(DEV_NULL) ; \
else \
echo "896"; \
fi)
MIN_VM_MEMORY := $(shell \
if [ $(MAX_VM_MEMORY) -le 128 ] ; then \
expr $(MAX_VM_MEMORY) '-' 8 2> $(DEV_NULL) ; \
else \
echo "128"; \
fi)
else else
MB_OF_MEMORY := unknown MB_OF_MEMORY := unknown
LOW_MEMORY_MACHINE := true LOW_MEMORY_MACHINE := true
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册