From 5e26720f180717709ab6288166fcdf8923f657d1 Mon Sep 17 00:00:00 2001
From: Pietro Gagliardi <pietro10@mac.com>
Date: Wed, 9 Dec 2015 13:49:13 -0500
Subject: [PATCH] Removed $ARCH from the build.

---
 GNUbaserules.mk          |  8 --------
 GNUmakefile              | 19 ++++---------------
 windows/GNUosspecific.mk | 11 -----------
 3 files changed, 4 insertions(+), 34 deletions(-)

diff --git a/GNUbaserules.mk b/GNUbaserules.mk
index d16c2c5e..7b573c8a 100644
--- a/GNUbaserules.mk
+++ b/GNUbaserules.mk
@@ -27,14 +27,6 @@ CXXFLAGS += \
 LDFLAGS += \
 	-g
 
-ifeq ($(ARCH),386)
-	CFLAGS += -m32
-	LDFLAGS += -m32
-else ifeq ($(ARCH),amd64)
-	CFLAGS += -m64
-	LDFLAGS += -m64
-endif
-
 OUT = $(OUTDIR)/$(NAME)$(SUFFIX)
 
 ifdef CXXFILES
diff --git a/GNUmakefile b/GNUmakefile
index 9ac65d17..934cc6bd 100644
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -24,23 +24,12 @@ ifndef OS
 	endif
 endif
 
-# TODO this is wrong for Haiku
-ifndef ARCH
-	UNAME = $(shell uname -m)
-	ifeq ($(UNAME),x86_64)
-		ARCH = amd64
-	else ifeq ($(UNAME),i686)
-		ARCH = 386
-	else
-		ARCH = default
-	endif
-endif
-
 libui:
-	@$(MAKE) -f GNUmakefile.libui OS=$(OS) ARCH=$(ARCH) OUTDIR=$(OUTDIR) OBJDIR=$(OBJDIR) inlibuibuild=1
+	@$(MAKE) -f GNUmakefile.libui OS=$(OS) OUTDIR=$(OUTDIR) OBJDIR=$(OBJDIR) inlibuibuild=1
 
+# TODO why is this not a regular old rule
 clean:
-	@$(MAKE) -f GNUmakefile.libui OS=$(OS) ARCH=$(ARCH) OUTDIR=$(OUTDIR) OBJDIR=$(OBJDIR) inlibuibuild=1 clean
+	@$(MAKE) -f GNUmakefile.libui OS=$(OS) OUTDIR=$(OUTDIR) OBJDIR=$(OBJDIR) inlibuibuild=1 clean
 
 test: libui
-	@$(MAKE) -f GNUmakefile.test OS=$(OS) ARCH=$(ARCH) OUTDIR=$(OUTDIR) OBJDIR=$(OBJDIR) inlibuibuild=1
+	@$(MAKE) -f GNUmakefile.test OS=$(OS) OUTDIR=$(OUTDIR) OBJDIR=$(OBJDIR) inlibuibuild=1
diff --git a/windows/GNUosspecific.mk b/windows/GNUosspecific.mk
index 87ee2eef..0896fc42 100644
--- a/windows/GNUosspecific.mk
+++ b/windows/GNUosspecific.mk
@@ -3,14 +3,3 @@
 EXESUFFIX = .exe
 LIBSUFFIX = .dll
 OSHSUFFIX = .h
-
-# TODO only when cross-compiling?
-ifeq ($(ARCH),amd64)
-	CC = x86_64-w64-mingw32-gcc
-	RC = x86_64-w64-mingw32-windres
-else ifeq ($(ARCH),386)
-	CC = i686-w64-mingw32-gcc
-	RC = i686-w64-mingw32-windres
-else ifneq ($(ARCH),default)
-$(error [FAIL] unknown architecture $(ARCH) for Windows build; I need to know which compiler to invoke)
-endif