Fix some more the building on macOS

3 files changed, 52 insertions, 33 deletions

diff --git a/Makefile b/Makefile
index bc1d3e0a..b836ff3c 100644
--- a/Makefile
+++ b/Makefile
@@ -3,23 +3,22 @@
 include config.mk
 include graphics_rules.mk
 
-HOSTCC := $(CC)
-HOSTCXX := $(CXX)
-HOSTCFLAGS := $(CFLAGS)
-HOSTCXXFLAGS := $(CXXFLAGS)
-HOSTPKGCONFIG := $(shell which pkg-config)
-HOSTPKGCONFIGPATH := $(PKG_CONFIG_PATH)
-HOST_VARS := CC=$(HOSTCC) CXX=$(HOSTCXX) CFLAGS='$(HOSTCFLAGS)' CXXFLAGS='$(HOSTCXXFLAGS)' PKGCONFIG='$(HOSTPKGCONFIG)' PKG_CONFIG_PATH='$(HOSTPKGCONFIGPATH)'
-
 .PHONY: clean tidy all default patch_mwasmarm
 
 # Try to include devkitarm if installed
+ifdef DEVKITARM
 TOOLCHAIN := $(DEVKITARM)
+endif
 
-ifneq (,$(wildcard $(TOOLCHAIN)/base_tools))
-include $(TOOLCHAIN)/base_tools
+ifdef TOOLCHAIN
+export PATH := $(TOOLCHAIN)/bin:$(PATH)
 endif
 
+PREFIX := arm-none-eabi-
+
+OBJCOPY := $(PREFIX)objcopy
+AR      := $(PREFIX)ar
+
 ### Default target ###
 
 default: all
@@ -130,6 +129,8 @@ TOOLDIRS = $(dir $(wildcard tools/*/Makefile))
 TOOLBASE = $(TOOLDIRS:$(TOOLS_DIR)/%=%)
 TOOLS = $(foreach tool,$(TOOLBASE),$(TOOLS_DIR)/$(tool)/$(tool)$(EXE))
 
+TOOLS: tools
+
 export LM_LICENSE_FILE := $(TOOLS_DIR)/mwccarm/license.dat
 export MWCIncludes := arm9/lib/libc/include arm9/lib/NitroSDK/include arm9/lib/libnns/include
 export MWLibraries := arm9/lib
@@ -141,7 +142,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, $(HOST_VARS) $(MAKE) tools patch_mwasmarm)
+$(call infoshell,$(MAKE) tools patch_mwasmarm)
 else
 NODEP := 1
 endif
@@ -153,6 +154,8 @@ endif
 
 MAKEFLAGS += --no-print-directory
 
+all: tools patch_mwasmarm
+
 all: $(ROM)
 ifeq ($(COMPARE),1)
 	@$(SHA1SUM) -c $(TARGET).sha1
@@ -182,10 +185,10 @@ tidy:
 tools: $(TOOLDIRS)
 
 $(TOOLDIRS):
-	@$(HOST_VARS) $(MAKE) -C $@
+	@$(MAKE) -C $@
 
 clean-tools:
-	$(foreach tool,$(TOOLDIRS),$(HOST_VARS) $(MAKE) clean -C $(tool);)
+	$(foreach tool,$(TOOLDIRS),$(MAKE) clean -C $(tool);)
 
 $(MWASMARM): patch_mwasmarm
 	@:
@@ -302,8 +305,8 @@ print-% : ; $(info $* is a $(flavor $*) variable set to [$($*)]) @true
 
 ### Other targets
 
-diamond:          ; @$(HOST_VARS) $(MAKE) GAME_VERSION=DIAMOND
-pearl:            ; @$(HOST_VARS) $(MAKE) GAME_VERSION=PEARL
-compare_diamond:  ; @$(HOST_VARS) $(MAKE) GAME_VERSION=DIAMOND COMPARE=1
-compare_pearl:    ; @$(HOST_VARS) $(MAKE) GAME_VERSION=PEARL COMPARE=1
+diamond:          ; @$(MAKE) GAME_VERSION=DIAMOND
+pearl:            ; @$(MAKE) GAME_VERSION=PEARL
+compare_diamond:  ; @$(MAKE) GAME_VERSION=DIAMOND COMPARE=1
+compare_pearl:    ; @$(MAKE) GAME_VERSION=PEARL COMPARE=1
 compare: compare_diamond
diff --git a/arm7/Makefile b/arm7/Makefile
index 4f99c50b..882ab41c 100644
--- a/arm7/Makefile
+++ b/arm7/Makefile
@@ -3,12 +3,19 @@
 .PHONY: clean tidy all default patch_mwasmarm
 
 # Try to include devkitarm if installed
+ifdef DEVKITARM
 TOOLCHAIN := $(DEVKITARM)
+endif
 
-ifneq (,$(wildcard $(TOOLCHAIN)/base_tools))
-include $(TOOLCHAIN)/base_tools
+ifdef TOOLCHAIN
+export PATH := $(TOOLCHAIN)/bin:$(PATH)
 endif
 
+PREFIX := arm-none-eabi-
+
+OBJCOPY := $(PREFIX)objcopy
+AR      := $(PREFIX)ar
+
 ### Default target ###
 
 default: all
@@ -111,17 +118,20 @@ TOOLDIRS = $(dir $(wildcard $(TOOLS_DIR)/*/Makefile))
 TOOLBASE = $(TOOLDIRS:$(TOOLS_DIR)/%=%)
 TOOLS = $(foreach tool,$(TOOLBASE),$(TOOLS_DIR)/$(tool)/$(tool)$(EXE))
 
+TOOLS: tools
+
 export LM_LICENSE_FILE := $(TOOLS_DIR)/mwccarm/license.dat
 export MWCIncludes := lib/include
 
 ######################### Targets ###########################
+######################## Targets ###########################
 
 infoshell = $(foreach line, $(shell $1 | sed "s/ /__SPACE__/g"), $(info $(subst __SPACE__, ,$(line))))
 
 # 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,$(MAKE) tools patch_mwasmarm)
 else
 NODEP := 1
 endif
@@ -131,6 +141,8 @@ endif
 
 MAKEFLAGS += --no-print-directory
 
+all: tools patch_mwasmarm
+
 all: $(ROM)
 ifeq ($(COMPARE),1)
 	@$(SHA1SUM) -c $(TARGET).sha1
diff --git a/arm9/Makefile b/arm9/Makefile
index e332a842..a5f4c665 100644
--- a/arm9/Makefile
+++ b/arm9/Makefile
@@ -2,23 +2,22 @@
 
 include ../config.mk
 
-HOSTCC := $(CC)
-HOSTCXX := $(CXX)
-HOSTCFLAGS := $(CFLAGS)
-HOSTCXXFLAGS := $(CXXFLAGS)
-HOSTPKGCONFIG := $(shell which pkg-config)
-HOSTPKGCONFIGPATH := $(PKG_CONFIG_PATH)
-HOST_VARS := CC=$(HOSTCC) CXX=$(HOSTCXX) CFLAGS='$(HOSTCFLAGS)' CXXFLAGS='$(HOSTCXXFLAGS)' PKGCONFIG='$(HOSTPKGCONFIG)' PKG_CONFIG_PATH='$(HOSTPKGCONFIGPATH)'
-
 .PHONY: clean tidy all default patch_mwasmarm
 
 # Try to include devkitarm if installed
+ifdef DEVKITARM
 TOOLCHAIN := $(DEVKITARM)
+endif
 
-ifneq (,$(wildcard $(TOOLCHAIN)/base_tools))
-include $(TOOLCHAIN)/base_tools
+ifdef TOOLCHAIN
+export PATH := $(TOOLCHAIN)/bin:$(PATH)
 endif
 
+PREFIX := arm-none-eabi-
+
+OBJCOPY := $(PREFIX)objcopy
+AR      := $(PREFIX)ar
+
 ### Default target ###
 
 default: all
@@ -147,18 +146,21 @@ TOOLDIRS = $(dir $(wildcard $(TOOLS_DIR)/*/Makefile))
 TOOLBASE = $(TOOLDIRS:$(TOOLS_DIR)/%=%)
 TOOLS = $(foreach tool,$(TOOLBASE),$(TOOLS_DIR)/$(tool)/$(tool)$(EXE))
 
+TOOLS: tools
+
 export LM_LICENSE_FILE := $(TOOLS_DIR)/mwccarm/license.dat
 export MWCIncludes := $(CURDIR)/lib/libc/include $(CURDIR)/lib/NitroSDK/include $(CURDIR)/lib/libnns/include
 export MWLibraries := $(CURDIR)/lib
 
 ######################### Targets ###########################
+######################## Targets ###########################
 
 infoshell = $(foreach line, $(shell $1 | sed "s/ /__SPACE__/g"), $(info $(subst __SPACE__, ,$(line))))
 
 # 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,$(MAKE) tools patch_mwasmarm)
 else
 NODEP := 1
 endif
@@ -168,6 +170,8 @@ endif
 
 MAKEFLAGS += --no-print-directory
 
+all: tools patch_mwasmarm
+
 all: $(ROM)
 ifeq ($(COMPARE),1)
 	@$(SHA1SUM) -c $(BUILD_TARGET).sha1
@@ -187,7 +191,7 @@ tidy:
 tools: $(TOOLDIRS)
 
 $(TOOLDIRS):
-	@$(HOST_VARS) $(MAKE) -C $@
+	@$(MAKE) -C $@
 
 $(MWASMARM): patch_mwasmarm
 
@@ -226,7 +230,7 @@ $(S_OBJS) $(LIBS_OBJS): $(BUILD_DIR)/%.o: %.s $$(dep)
 	$(AS) $(ASFLAGS) -o $@ $<
 
 $(BUILD_DIR)/$(LD_TEMPLATE): $(BUILD_DIR)/%: %
-	(echo -e "KEEP_SECTION\n{\n\t.exceptix\n}\n"; cat $<) > $@
+	(echo "KEEP_SECTION\n{\n\t.exceptix\n}\n"; cat $<) > $@
 
 $(BUILD_DIR)/$(LD_SCRIPT): $(LD_SPEC) $(BUILD_DIR)/$(LD_TEMPLATE)
 	$(MAKELCF) $(MAKELCF_FLAGS) $^ $@