From 55f4362c9827474b8666ec0506e94b2a41c3e8e2 Mon Sep 17 00:00:00 2001
From: Kevin Mills <kevin.mills@sifive.com>
Date: Thu, 20 Jun 2019 11:10:26 -0700
Subject: fixup standalone targets to work.

---
 Makefile | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index 2be82e1..aa1839e 100644
--- a/Makefile
+++ b/Makefile
@@ -214,7 +214,11 @@ standalone: \
 
 	find $</scripts/elf2hex -name ".git*" | xargs rm -rf
 
+ifeq ($(PORT_DIR),)
 	$(MAKE) -C $(SRC_DIR) clean
+else
+	$(MAKE) -C $(SRC_DIR) PORT_DIR=${PORT_DIR} clean
+endif
 	cp -r $(SRC_DIR)/* $</src/
 
 	cp debug.mk $</debug.mk
@@ -222,7 +226,7 @@ standalone: \
 
 	echo "PROGRAM = $(PROGRAM)" > $</Makefile
 ifneq ($(PORT_DIR),)
-	echo "PORT_DIR = $(PORT_DIR)" > $</Makefile
+	echo "PORT_DIR = $(PORT_DIR)" >> $</Makefile
 endif
 	cat scripts/standalone.mk >> $</Makefile
 	cat scripts/libmetal.mk >> $</Makefile
@@ -243,7 +247,11 @@ standalone: \
 
 	find $</freedom-metal -name ".git*" | xargs rm -rf
 
+ifeq ($(PORT_DIR),)
 	$(MAKE) -C $(SRC_DIR) clean
+else
+	$(MAKE) -C $(SRC_DIR) PORT_DIR=${PORT_DIR} clean
+endif
 	cp -r $(SRC_DIR)/* $</src/
 
 	cp debug.mk $</debug.mk
@@ -251,7 +259,7 @@ standalone: \
 
 	echo "PROGRAM = $(PROGRAM)" > $</Makefile
 ifneq ($(PORT_DIR),)
-        echo "PORT_DIR = $(PORT_DIR)" > $</Makefile
+	echo "PORT_DIR = $(PORT_DIR)" >> $</Makefile
 endif
 	cat scripts/standalone.mk >> $</Makefile
 	cat scripts/libmetal.mk >> $</Makefile
-- 
cgit v1.2.1-18-gbd029


From 8c9a08bc9afbaf08f055e4fa3c7daaa7153af569 Mon Sep 17 00:00:00 2001
From: Kevin Mills <kevin.mills@sifive.com>
Date: Thu, 20 Jun 2019 11:20:07 -0700
Subject: make "clean" work too.

---
 scripts/standalone.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/standalone.mk b/scripts/standalone.mk
index a29bce4..2378b12 100644
--- a/scripts/standalone.mk
+++ b/scripts/standalone.mk
@@ -221,7 +221,7 @@ endif
 
 .PHONY: clean-software
 clean-software:
-	$(MAKE) -C $(SRC_DIR) clean
+	$(MAKE) -C $(SRC_DIR) PORT_DIR=$(PORT_DIR) clean
 	rm -rf $(SRC_DIR)/$(CONFIGURATION)
 .PHONY: clean
 clean: clean-software
-- 
cgit v1.2.1-18-gbd029