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

Fix SBT_BIN to java -jar from sbt

Browse Source
This commit is contained in:
joey0320
2022-12-17 00:53:29 -08:00
parent bd0b3e8f1d
commit 35cceb6428
1 changed files with 0 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
variables.mk
View File

@@ -214,8 +214,6 @@ SBT_CLIENT_FLAG = --client
endif endif
# passes $(JAVA_TOOL_OPTIONS) from env to java # passes $(JAVA_TOOL_OPTIONS) from env to java
# 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_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))