From f098a7bc756fe38a446ef8cd1a6b74856d2e348e Mon Sep 17 00:00:00 2001
From: Palmer Dabbelt
Date: Sat, 5 Mar 2016 20:14:58 -0800
Subject: Use $(MAKE), not make

---
 Makefile | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/Makefile b/Makefile
index 6092a71f..75520b73 100644
--- a/Makefile
+++ b/Makefile
@@ -43,15 +43,15 @@ build-fast: $(stanza)
 
 build-deploy: 
 	cd $(firrtl_dir) && $(stanza) -i firrtl-main.stanza -o $(install_dir)/firrtl-stanza
-	make set-stanza
+	$(MAKE) set-stanza
 
 build: 
 	cd $(firrtl_dir) && $(stanza) -i firrtl-test-main.stanza -o $(install_dir)/firrtl-stanza
-	make set-stanza
+	$(MAKE) set-stanza
 
 build-fast: 
 	cd $(firrtl_dir) && $(stanza) -i firrtl-test-main.stanza -o $(install_dir)/firrtl-stanza -flags OPTIMIZE
-	make set-stanza
+	$(MAKE) set-stanza
 
 check: 
 	cd $(test_dir) && lit -j 2 -v . --path=$(install_dir)/
@@ -115,7 +115,7 @@ fail:
 # Scala Added Makefile commands
 
 build-scala: $(scala_jar)
-	make set-scala
+	$(MAKE) set-scala
 
 $(scala_jar): $(scala_src)
 	"$(sbt)" "assembly"
-- 
cgit v1.2.3


From 8ae6ece99dfadb8d3dd25acc3549a975e3c40bbc Mon Sep 17 00:00:00 2001
From: Palmer Dabbelt
Date: Sat, 5 Mar 2016 20:27:04 -0800
Subject: Fix the stanza wrapper for Travis

The printf call you're making doesn't appear to be standard, so I've
replaced it with something else.
---
 Makefile             | 4 +++-
 utils/stanza-wrapper | 3 +++
 2 files changed, 6 insertions(+), 1 deletion(-)
 create mode 100755 utils/stanza-wrapper

diff --git a/Makefile b/Makefile
index 75520b73..827211fb 100644
--- a/Makefile
+++ b/Makefile
@@ -26,8 +26,10 @@ $(root_dir)/src/lib/stanza/stamp: src/lib/stanza-$(stanza_zip_name).zip
 	cd src/lib && unzip stanza-$(stanza_zip_name).zip
 	touch $@
 
-$(stanza): $(root_dir)/src/lib/stanza/stamp
+utils/bin/stanza: $(stanza)
+$(stanza): $(root_dir)/src/lib/stanza/stamp $(root_dir)/utils/stanza-wrapper
 	cd src/lib/stanza && ./stanza -platform $(stanza_target_name) -install $(stanza)
+	cat $(root_dir)/utils/stanza-wrapper | sed 's!@@TOP@@!$(root_dir)!g' > $@
 
 $(stanza_bin): $(stanza) $(stanza_src)
 	cd $(firrtl_dir) && $(stanza) -i firrtl-test-main.stanza -o $@
diff --git a/utils/stanza-wrapper b/utils/stanza-wrapper
new file mode 100755
index 00000000..10c8b204
--- /dev/null
+++ b/utils/stanza-wrapper
@@ -0,0 +1,3 @@
+#!/bin/bash
+
+eval '@@TOP@@/src/lib/stanza/stanza' -platform linux "$@"
-- 
cgit v1.2.3