зеркало из https://github.com/mozilla/pjs.git
Get rid of unnecessary heapsize option.
This commit is contained in:
Родитель
1338ff6e0b
Коммит
337636fdef
|
@ -378,11 +378,6 @@ ifeq ($(JDK_CLASS_REPOSITORY_OPT),)
|
|||
JDK_CLASS_REPOSITORY_OPT = -d $(JAVA_DESTPATH)
|
||||
endif
|
||||
|
||||
# initialize the JDK heap size option to a default value
|
||||
ifeq ($(JDK_INIT_HEAP_OPT),)
|
||||
JDK_INIT_HEAP_OPT = -ms8m
|
||||
endif
|
||||
|
||||
# define a default JDK classpath
|
||||
ifeq ($(JDK_CLASSPATH),)
|
||||
JDK_CLASSPATH = '$(JAVA_DESTPATH)$(PATH_SEPARATOR)$(JAVA_SOURCEPATH)$(PATH_SEPARATOR)$(JAVA_CLASSES)'
|
||||
|
@ -434,7 +429,6 @@ ifeq ($(JAVA),)
|
|||
JAVA_FLAGS = $(JDK_THREADING_MODEL_OPT)
|
||||
JAVA_FLAGS += $(JDK_DEBUG_OPT)
|
||||
JAVA_FLAGS += $(JDK_CLASSPATH_OPT)
|
||||
JAVA_FLAGS += $(JDK_INIT_HEAP_OPT)
|
||||
JAVA_FLAGS += $(JDK_JIT_OPT)
|
||||
JAVA = $(JAVA_PROG) $(JAVA_FLAGS)
|
||||
endif
|
||||
|
@ -449,7 +443,6 @@ ifeq ($(JAVAC),)
|
|||
JAVAC_FLAGS += $(JDK_OPTIMIZER_OPT)
|
||||
JAVAC_FLAGS += $(JDK_DEBUG_OPT)
|
||||
JAVAC_FLAGS += $(JDK_CLASSPATH_OPT)
|
||||
JAVAC_FLAGS += -J$(JDK_INIT_HEAP_OPT)
|
||||
JAVAC_FLAGS += $(JDK_CLASS_REPOSITORY_OPT)
|
||||
JAVAC = $(JAVAC_PROG) $(JAVAC_FLAGS)
|
||||
endif
|
||||
|
@ -462,7 +455,6 @@ ifeq ($(JAVADOC),)
|
|||
JAVADOC_PROG = $(JAVA_HOME)/bin/javadoc$(PROG_SUFFIX)
|
||||
JAVADOC_FLAGS = $(JDK_THREADING_MODEL_OPT)
|
||||
JAVADOC_FLAGS += $(JDK_CLASSPATH_OPT)
|
||||
JAVADOC_FLAGS += -J$(JDK_INIT_HEAP_OPT)
|
||||
JAVADOC = $(JAVADOC_PROG) $(JAVADOC_FLAGS)
|
||||
endif
|
||||
|
||||
|
@ -495,7 +487,6 @@ ifeq ($(JAVAP),)
|
|||
JAVAP_PROG = $(JAVA_HOME)/bin/javap$(PROG_SUFFIX)
|
||||
JAVAP_FLAGS = $(JDK_THREADING_MODEL_OPT)
|
||||
JAVAP_FLAGS += $(JDK_CLASSPATH_OPT)
|
||||
JAVAP_FLAGS += -J$(JDK_INIT_HEAP_OPT)
|
||||
JAVAP = $(JAVAP_PROG) $(JAVAP_FLAGS)
|
||||
endif
|
||||
|
||||
|
@ -528,7 +519,6 @@ ifeq ($(JAVAW),)
|
|||
jJAVAW_FLAGS = $(JDK_THREADING_MODEL_OPT)
|
||||
jJAVAW_FLAGS += $(JDK_DEBUG_OPT)
|
||||
jJAVAW_FLAGS += $(JDK_CLASSPATH_OPT)
|
||||
jJAVAW_FLAGS += $(JDK_INIT_HEAP_OPT)
|
||||
jJAVAW_FLAGS += $(JDK_JIT_OPT)
|
||||
jJAVAW = $(JAVAW_PROG) $(JAVAW_FLAGS)
|
||||
endif
|
||||
|
@ -542,7 +532,6 @@ ifeq ($(JDB),)
|
|||
JDB_FLAGS = $(JDK_THREADING_MODEL_OPT)
|
||||
JDB_FLAGS += $(JDK_DEBUG_OPT)
|
||||
JDB_FLAGS += $(JDK_CLASSPATH_OPT)
|
||||
JDB_FLAGS += $(JDK_INIT_HEAP_OPT)
|
||||
JDB_FLAGS += $(JDK_JIT_OPT)
|
||||
JDB = $(JDB_PROG) $(JDB_FLAGS)
|
||||
endif
|
||||
|
@ -555,7 +544,6 @@ ifeq ($(JRE),)
|
|||
JRE_PROG = $(JAVA_HOME)/bin/jre$(PROG_SUFFIX)
|
||||
JRE_FLAGS = $(JDK_THREADING_MODEL_OPT)
|
||||
JRE_FLAGS += $(JDK_CLASSPATH_OPT)
|
||||
JRE_FLAGS += $(JDK_INIT_HEAP_OPT)
|
||||
JRE_FLAGS += $(JDK_JIT_OPT)
|
||||
JRE = $(JRE_PROG) $(JRE_FLAGS)
|
||||
endif
|
||||
|
@ -568,7 +556,6 @@ ifeq ($(JREW),)
|
|||
JREW_PROG = $(JAVA_HOME)/bin/jrew$(PROG_SUFFIX)
|
||||
JREW_FLAGS = $(JDK_THREADING_MODEL_OPT)
|
||||
JREW_FLAGS += $(JDK_CLASSPATH_OPT)
|
||||
JREW_FLAGS += $(JDK_INIT_HEAP_OPT)
|
||||
JREW_FLAGS += $(JDK_JIT_OPT)
|
||||
JREW = $(JREW_PROG) $(JREW_FLAGS)
|
||||
endif
|
||||
|
|
Загрузка…
Ссылка в новой задаче