Fix SBT/JAVA_OPTS
This commit is contained in:
@@ -212,7 +212,7 @@ sim_common_files ?= $(build_dir)/sim_files.common.f
|
|||||||
#########################################################################################
|
#########################################################################################
|
||||||
JAVA_HEAP_SIZE ?= 8G
|
JAVA_HEAP_SIZE ?= 8G
|
||||||
JAVA_TMP_DIR ?= $(base_dir)/.java_tmp
|
JAVA_TMP_DIR ?= $(base_dir)/.java_tmp
|
||||||
export JAVA_TOOL_OPTIONS ?= -Xmx$(JAVA_HEAP_SIZE) -Xss8M -Dsbt.supershell=false -Djava.io.tmpdir=$(JAVA_TMP_DIR)
|
export JAVA_TOOL_OPTIONS ?= -Xmx$(JAVA_HEAP_SIZE) -Xss8M -Djava.io.tmpdir=$(JAVA_TMP_DIR)
|
||||||
|
|
||||||
#########################################################################################
|
#########################################################################################
|
||||||
# default sbt launch command
|
# default sbt launch command
|
||||||
@@ -220,6 +220,7 @@ export JAVA_TOOL_OPTIONS ?= -Xmx$(JAVA_HEAP_SIZE) -Xss8M -Dsbt.supershell=false
|
|||||||
SCALA_BUILDTOOL_DEPS = $(SBT_SOURCES)
|
SCALA_BUILDTOOL_DEPS = $(SBT_SOURCES)
|
||||||
|
|
||||||
# passes $(JAVA_TOOL_OPTIONS) from env to java
|
# passes $(JAVA_TOOL_OPTIONS) from env to java
|
||||||
|
export SBT_OPTS ?= -Dsbt.ivy.home=$(base_dir)/.ivy2 -Dsbt.global.base=$(base_dir)/.sbt -Dsbt.boot.directory=$(base_dir)/.sbt/boot/ -Dsbt.color=always -Dsbt.supershell=false
|
||||||
SBT ?= java -jar $(ROCKETCHIP_DIR)/sbt-launch.jar $(SBT_OPTS)
|
SBT ?= java -jar $(ROCKETCHIP_DIR)/sbt-launch.jar $(SBT_OPTS)
|
||||||
|
|
||||||
# (1) - classpath of the fat jar
|
# (1) - classpath of the fat jar
|
||||||
|
|||||||
Reference in New Issue
Block a user