From 4beaad255f4fbb5c19cfb36e67d9679015f87a10 Mon Sep 17 00:00:00 2001 From: Jerry Zhao Date: Mon, 10 Oct 2022 14:29:55 -0700 Subject: [PATCH] Revert to using sbt-launch.jar to run SBT --- variables.mk | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/variables.mk b/variables.mk index c753653d..22848145 100644 --- a/variables.mk +++ b/variables.mk @@ -192,7 +192,9 @@ SBT_CLIENT_FLAG = --client endif # passes $(JAVA_TOOL_OPTIONS) from env to java -SBT_BIN ?= sbt +# Use java -jar approach by default so that SBT thin-client sees the JAVA flags +# Workaround for behavior reported here: https://github.com/sbt/sbt/issues/6468 +SBT_BIN ?= java -jar $(ROCKETCHIP_DIR)/sbt-launch.jar SBT = $(SBT_BIN) $(SBT_CLIENT_FLAG) SBT_NON_THIN = $(subst $(SBT_CLIENT_FLAG),,$(SBT))