1
0

build: use local sbt when building firrtl

This commit is contained in:
Wesley W. Terpstra 2016-05-25 11:36:24 -07:00 committed by Andrew Waterman
parent e82c080c3c
commit da566e7d6a
2 changed files with 2 additions and 2 deletions

View File

@ -11,7 +11,7 @@ CXXFLAGS := -O1
CHISEL_VERSION ?= 2 CHISEL_VERSION ?= 2
export CHISEL_VERSION 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 SHELL := /bin/bash
ifeq ($(CHISEL_VERSION),2) ifeq ($(CHISEL_VERSION),2)

View File

@ -15,7 +15,7 @@ else
FIRRTL ?= $(base_dir)/firrtl/utils/bin/firrtl FIRRTL ?= $(base_dir)/firrtl/utils/bin/firrtl
$(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 # If I don't mark these as .SECONDARY then make will delete these internal
# files. # files.