From 99f1a3aed3ce9119110ab7db919b83625218bc15 Mon Sep 17 00:00:00 2001 From: abejgonzalez Date: Fri, 12 Nov 2021 12:09:02 -0800 Subject: [PATCH] Separate the base SBT command from the --client addition This makes it easier to override just SBT_BIN and still use the ENABLE_SBT_THIN_CLIENT flag when using a downloaded SBT script --- common.mk | 2 +- variables.mk | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/common.mk b/common.mk index ceddb765..157bb9a3 100644 --- a/common.mk +++ b/common.mk @@ -18,7 +18,7 @@ HELP_COMPILATION_VARIABLES += \ " EXTRA_SIM_LDFLAGS = additional LDFLAGS for building simulators" \ " EXTRA_SIM_SOURCES = additional simulation sources needed for simulator" \ " EXTRA_SIM_REQS = additional make requirements to build the simulator" \ -" ENABLE_SBT_THIN_CLIENT = if set, use sbt's experimental thin client (works best with sbtn or sbt script)" \ +" ENABLE_SBT_THIN_CLIENT = if set, use sbt's experimental thin client (works best when overridding SBT_BIN with sbt script)" \ " EXTRA_CHISEL_OPTIONS = additional options to pass to the Chisel compiler" \ " EXTRA_FIRRTL_OPTIONS = additional options to pass to the FIRRTL compiler" diff --git a/variables.mk b/variables.mk index 1279c28e..02b2c6be 100644 --- a/variables.mk +++ b/variables.mk @@ -175,7 +175,8 @@ override SCALA_BUILDTOOL_DEPS += $(SBT_THIN_CLIENT_TIMESTAMP) SBT_CLIENT_FLAG = --client endif -SBT ?= java $(JAVA_TOOL_OPTIONS) -jar $(ROCKETCHIP_DIR)/sbt-launch.jar $(SBT_OPTS) $(SBT_CLIENT_FLAG) +SBT_BIN ?= java $(JAVA_TOOL_OPTIONS) -jar $(ROCKETCHIP_DIR)/sbt-launch.jar $(SBT_OPTS) +SBT ?= $(SBT_BIN) $(SBT_CLIENT_FLAG) SBT_NON_THIN ?= $(subst $(SBT_CLIENT_FLAG),,$(SBT)) define run_scala_main