Skip to content

Commit d8df375

Browse files
abejgonzalezmergify[bot]
authored andcommitted
Move .ivy2 and .sbt into Chipyard root
1 parent 156255f commit d8df375

File tree

2 files changed

+4
-1
lines changed

2 files changed

+4
-1
lines changed

.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,3 +24,5 @@ first-clone-setup-fast-log
2424
project/.bloop/
2525
project/metals.sbt
2626
project/project/
27+
.ivy2
28+
.sbt

variables.mk

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -220,7 +220,8 @@ SBT_CLIENT_FLAG = --client
220220
endif
221221

222222
# passes $(JAVA_TOOL_OPTIONS) from env to java
223-
SBT_BIN ?= java -jar $(ROCKETCHIP_DIR)/sbt-launch.jar
223+
export SBT_OPTS ?= -Dsbt.ivy.home=$(base_dir)/.ivy2 -Dsbt.global.base=$(base_dir)/.sbt -Dsbt.boot.directory=$(base_dir)/.sbt/boot/
224+
SBT_BIN ?= java -jar $(ROCKETCHIP_DIR)/sbt-launch.jar $(SBT_OPTS)
224225
SBT = $(SBT_BIN) $(SBT_CLIENT_FLAG)
225226
SBT_NON_THIN = $(subst $(SBT_CLIENT_FLAG),,$(SBT))
226227

0 commit comments

Comments
 (0)