From ccb7a93a7c11a28b23a49d214dba894cbd108667 Mon Sep 17 00:00:00 2001
From: hendricks266 <hendricks266@1a8010ca-5511-0410-912e-c29ae57300e0>
Date: Sat, 29 Oct 2016 16:59:28 +0000
Subject: [PATCH] Makefile: Revert r5864 and move some code introduced in r5762
 to a later Mac-only block so that architecture detection is not broken on
 Linux.

git-svn-id: https://svn.eduke32.com/eduke32@5919 1a8010ca-5511-0410-912e-c29ae57300e0
---
 polymer/eduke32/Makefile.common | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/polymer/eduke32/Makefile.common b/polymer/eduke32/Makefile.common
index dda414ba9..59e71033c 100644
--- a/polymer/eduke32/Makefile.common
+++ b/polymer/eduke32/Makefile.common
@@ -324,18 +324,9 @@ ifeq ($(PLATFORM),WINDOWS)
     WINLIB?=/$(BITS)
 else ifeq ($(PLATFORM),WII)
     IMPLICIT_ARCH=ppc
-else ifeq ($(PLATFORM),DARWIN)
-    ifeq (1,$(BUILD32_ON_64))
-        ifeq ($(ARCH),)
-            override ARCH:=-arch i386
-        endif
-    endif
-
+else
     ifneq ($(ARCH),)
         override ARCH:=$(subst i486,i386,$(subst i586,i386,$(subst i686,i386,$(strip $(ARCH)))))
-        ifneq ($(findstring -arch,$(ARCH)),-arch)
-            override ARCH := -arch $(ARCH)
-        endif
         IMPLICIT_ARCH=$(ARCH)
     else
         IMPLICIT_ARCH:=$(subst i486,i386,$(subst i586,i386,$(subst i686,i386,$(strip $(shell uname -m)))))
@@ -367,8 +358,17 @@ ifeq ($(PLATFORM),DARWIN)
         W_STRICT_OVERFLOW :=
     endif
 
+    ifneq ($(ARCH),)
+        ifneq ($(findstring -arch,$(ARCH)),-arch)
+            override ARCH := -arch $(ARCH)
+        endif
+    endif
+
     ifeq (1,$(BUILD32_ON_64))
         COMMONFLAGS += $(F_NO_STACK_PROTECTOR)
+        ifeq ($(ARCH),)
+            override ARCH:=-arch i386
+        endif
     else
         ifeq ($(findstring ppc,$(IMPLICIT_ARCH)),ppc)
             COMMONFLAGS += $(F_NO_STACK_PROTECTOR)