From da566e7d6a40b5b3825df73e3d56d5b4ac36a5f5 Mon Sep 17 00:00:00 2001 From: "Wesley W. Terpstra" Date: Wed, 25 May 2016 11:36:24 -0700 Subject: [PATCH] build: use local sbt when building firrtl --- Makefrag | 2 +- vsim/Makefrag-verilog | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefrag b/Makefrag index 24f2f0f0..8765508e 100644 --- a/Makefrag +++ b/Makefrag @@ -11,7 +11,7 @@ CXXFLAGS := -O1 CHISEL_VERSION ?= 2 export CHISEL_VERSION -SBT ?= java -Xmx2G -Xss8M -XX:MaxPermSize=256M -jar sbt-launch.jar +SBT ?= java -Xmx2G -Xss8M -XX:MaxPermSize=256M -jar $(base_dir)/sbt-launch.jar SHELL := /bin/bash ifeq ($(CHISEL_VERSION),2) diff --git a/vsim/Makefrag-verilog b/vsim/Makefrag-verilog index 5844237c..d270b72a 100644 --- a/vsim/Makefrag-verilog +++ b/vsim/Makefrag-verilog @@ -15,7 +15,7 @@ else FIRRTL ?= $(base_dir)/firrtl/utils/bin/firrtl $(FIRRTL): - $(MAKE) -C $(base_dir)/firrtl root_dir=$(base_dir)/firrtl build-scala + $(MAKE) -C $(base_dir)/firrtl SBT="$(SBT)" root_dir=$(base_dir)/firrtl build-scala # If I don't mark these as .SECONDARY then make will delete these internal # files.