diff --git a/polymer/eduke32/Makefile.common b/polymer/eduke32/Makefile.common
index a2e66b6c6..aa30cf669 100644
--- a/polymer/eduke32/Makefile.common
+++ b/polymer/eduke32/Makefile.common
@@ -296,9 +296,21 @@ ifeq ($(PLATFORM),WINDOWS)
 
     ifeq ($(findstring x86_64,$(COMPILERTARGET)),x86_64)
         SYSARCH:=x86_64
+        SYSBITS=64
     endif
 
     WINLIB?=/$(SYSBITS)
+else
+ifneq (1,$(BUILD32_ON_64))
+    ifeq ($(findstring x86_64,$(ARCH)),x86_64)
+        SYSBITS=64
+    endif
+    ifeq ($(ARCH),)
+        ifeq ($(findstring x86_64,$(SYSARCH)),x86_64)
+            SYSBITS=64
+        endif
+    endif
+endif
 endif
 
 ifeq ($(PLATFORM),DARWIN)
@@ -329,16 +341,6 @@ ifeq ($(PLATFORM),DARWIN)
 endif
 
 
-ifneq (1,$(BUILD32_ON_64))
-    ifeq ($(findstring x86_64,$(ARCH)),x86_64)
-        SYSBITS=64
-    endif
-    ifeq ($(findstring x86_64,$(SYSARCH)),x86_64)
-        SYSBITS=64
-    endif
-endif
-
-
 ifndef OPTOPT
     ifeq ($(PLATFORM), WII)
         OPTOPT=