From 49595bb18d203e71d0f15e3e4a475b18e014ed01 Mon Sep 17 00:00:00 2001
From: Pietro Gagliardi <pietro10@mac.com>
Date: Thu, 7 May 2015 16:02:34 -0400
Subject: [PATCH] Set up proper -m flag manipulation for cross-compiling
 builds.

---
 GNUbase.mk            | 2 ++
 GNUmakefile           | 2 +-
 darwin/GNUmakeinc.mk  | 5 +++--
 windows/GNUmakeinc.mk | 6 ++----
 4 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/GNUbase.mk b/GNUbase.mk
index cbfe183e..d4b2e009 100644
--- a/GNUbase.mk
+++ b/GNUbase.mk
@@ -19,11 +19,13 @@ xCFLAGS = \
 	-Wno-switch \
 	--std=c99 \
 	$(CFLAGS) \
+	$(archmflag) \
 	$(baseCFLAGS)
 
 xLDFLAGS = \
 	-g \
 	$(LDFLAGS) \
+	$(archmflag) \
 	$(baseLDFLAGS)
 
 OUT = $(OUTDIR)/$(OUTBASE)$(baseSUFFIX)
diff --git a/GNUmakefile b/GNUmakefile
index 6aa8c913..9694747c 100644
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -39,5 +39,5 @@ baseSUFFIX = $(osLIBSUFFIX)
 include GNUbase.mk
 
 test: $(OUT)
-	$(MAKE) -f GNUmaketest.mk osLIB=$(OUT) osEXESUFFIX=$(osEXESUFFIX) CC=$(CC)
+	$(MAKE) -f GNUmaketest.mk osLIB=$(OUT) osEXESUFFIX=$(osEXESUFFIX) CC=$(CC) archmflag=$(archmflag)
 .PHONY: test
diff --git a/darwin/GNUmakeinc.mk b/darwin/GNUmakeinc.mk
index f8155901..ed571ce0 100644
--- a/darwin/GNUmakeinc.mk
+++ b/darwin/GNUmakeinc.mk
@@ -31,6 +31,7 @@ osLIBSUFFIX = .dylib
 osEXESUFFIX =
 
 ifeq ($(ARCH),386)
-	osCFLAGS += -m32
-	osLDFLAGS += -m32
+	archmflag = -m32
+else
+	archmflag = -m64
 endif
diff --git a/windows/GNUmakeinc.mk b/windows/GNUmakeinc.mk
index 0ecad205..538c3ae2 100644
--- a/windows/GNUmakeinc.mk
+++ b/windows/GNUmakeinc.mk
@@ -38,11 +38,9 @@ osEXESUFFIX = .exe
 ifeq ($(ARCH),amd64)
 	CC = x86_64-w64-mingw32-gcc
 	RC = x86_64-w64-mingw32-windres
-	osCFLAGS += -m64
-	osLDFLAGS += -m64
+	archmflag = -m64
 else
 	CC = i686-w64-mingw32-gcc
 	RC = i686-w64-mingw32-windres
-	osCFLAGS += -m32
-	osLDFLAGS += -m32
+	archmflag = -m32
 endif