From 484262d6ce6979276853cbe202fc038b4700ce2d Mon Sep 17 00:00:00 2001 From: Yunsup Lee Date: Tue, 19 Apr 2016 11:34:06 -0700 Subject: streamline sbt --- Makefile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index cff0441f..37349a1d 100644 --- a/Makefile +++ b/Makefile @@ -4,7 +4,7 @@ regress_dir ?= $(root_dir)/regress firrtl_dir ?= $(root_dir)/src/main/stanza install_dir ?= $(root_dir)/utils/bin -sbt ?= sbt +SBT ?= sbt stanza ?= $(install_dir)/stanza stanza_bin ?= $(install_dir)/firrtl-stanza scala_jar ?= $(install_dir)/firrtl.jar @@ -84,7 +84,7 @@ clean: rm -f $(install_dir)/firrtl.jar rm -f $(install_dir)/firrtl rm -f $(install_dir)/firrtl-stanza - "$(sbt)" "clean" + $(SBT) "clean" riscv: cd $(test_dir)/riscv-mini && lit -v . --path=$(install_dir)/ @@ -110,10 +110,10 @@ build-scala: $(scala_jar) $(MAKE) set-scala $(scala_jar): $(scala_src) - "$(sbt)" "assembly" + $(SBT) "assembly" test-scala: - "$(sbt)" test + $(SBT) test set-scala: ln -f -s $(install_dir)/firrtl-scala $(install_dir)/firrtl -- cgit v1.2.3