From 44a2eebad6b899d0ad5be6a0a206a7473bb97b3f Mon Sep 17 00:00:00 2001 From: abejgonzalez Date: Thu, 18 May 2023 00:21:48 -0700 Subject: [PATCH] Fix SBT/JAVA_OPTS --- variables.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/variables.mk b/variables.mk index bec94188..d43c0b63 100644 --- a/variables.mk +++ b/variables.mk @@ -212,7 +212,7 @@ sim_common_files ?= $(build_dir)/sim_files.common.f ######################################################################################### JAVA_HEAP_SIZE ?= 8G 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 @@ -220,6 +220,7 @@ export JAVA_TOOL_OPTIONS ?= -Xmx$(JAVA_HEAP_SIZE) -Xss8M -Dsbt.supershell=false SCALA_BUILDTOOL_DEPS = $(SBT_SOURCES) # 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) # (1) - classpath of the fat jar