wu-arch/chipyard
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Revert to using sbt-launch.jar to run SBT

Browse Source
This commit is contained in:
Jerry Zhao
2022-10-10 14:29:55 -07:00
parent f5cda1c00a
commit 4beaad255f
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
variables.mk
View File

@@ -192,7 +192,9 @@ SBT_CLIENT_FLAG = --client
endif endif
# passes $(JAVA_TOOL_OPTIONS) from env to java # 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 = $(SBT_BIN) $(SBT_CLIENT_FLAG)
SBT_NON_THIN = $(subst $(SBT_CLIENT_FLAG),,$(SBT)) SBT_NON_THIN = $(subst $(SBT_CLIENT_FLAG),,$(SBT))