From 672325017c48804a933ef944e63f2b5918763f7f Mon Sep 17 00:00:00 2001
From: mid-kid <esteve.varela@gmail.com>
Date: Mon, 8 Jun 2020 14:57:36 +0200
Subject: Pass down host variables

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

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index ea6e00fb..1d0c177f 100644
--- a/Makefile
+++ b/Makefile
@@ -3,10 +3,11 @@
 include config.mk
 include filesystem.mk
 
-HOSTCC := $(CC)
-HOSTCXX := $(CXX)
+HOSTCC = $(CC)
+HOSTCXX = $(CXX)
 HOSTCFLAGS = $(CFLAGS)
 HOSTCXXFLAGS = $(CXXFLAGS)
+HOST_VARS := CC=$(HOSTCC) CXX=$(HOSTCXX) CFLAGS=$(HOSTCFLAGS) CXXFLAGS=$(HOSTCXXFLAGS)
 
 .PHONY: clean tidy all default patch_mwasmarm
 
@@ -219,7 +220,7 @@ infoshell = $(foreach line, $(shell $1 | sed "s/ /__SPACE__/g"), $(info $(subst
 # Build tools when building the rom
 # Disable dependency scanning for clean/tidy/tools
 ifeq (,$(filter-out all,$(MAKECMDGOALS)))
-$(call infoshell, $(MAKE) tools patch_mwasmarm)
+$(call infoshell, $(HOST_VARS) $(MAKE) tools patch_mwasmarm)
 else
 NODEP := 1
 endif
@@ -256,7 +257,7 @@ tidy:
 tools: $(TOOLDIRS)
 
 $(TOOLDIRS):
-	@$(MAKE) -C $@
+	@$(HOST_VARS) $(MAKE) -C $@
 
 $(MWASMARM): patch_mwasmarm
 	@:
-- 
cgit v1.2.3


From 43fc22bcacb17d515e7993acc0b61b7369d18d98 Mon Sep 17 00:00:00 2001
From: mid-kid <esteve.varela@gmail.com>
Date: Mon, 8 Jun 2020 15:03:30 +0200
Subject: Quotes are important sometimes I guess

---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index 1d0c177f..ff18771a 100644
--- a/Makefile
+++ b/Makefile
@@ -7,7 +7,7 @@ HOSTCC = $(CC)
 HOSTCXX = $(CXX)
 HOSTCFLAGS = $(CFLAGS)
 HOSTCXXFLAGS = $(CXXFLAGS)
-HOST_VARS := CC=$(HOSTCC) CXX=$(HOSTCXX) CFLAGS=$(HOSTCFLAGS) CXXFLAGS=$(HOSTCXXFLAGS)
+HOST_VARS := CC=$(HOSTCC) CXX=$(HOSTCXX) CFLAGS='$(HOSTCFLAGS)' CXXFLAGS='$(HOSTCXXFLAGS)'
 
 .PHONY: clean tidy all default patch_mwasmarm
 
-- 
cgit v1.2.3