diff --git a/make/defs.mk b/make/defs.mk
index 18c3e466..dee9257f 100644
--- a/make/defs.mk
+++ b/make/defs.mk
@@ -95,6 +95,8 @@ OS_NAME_VERSION       ?= $(shell $(GET_OS_SH))
 OS_NAME               ?= $(shell $(GET_OS_SH) name)
 ARCH                  ?= $(TARGET_ARCH)
 
+ARCH_32                = i586
+
 ifndef ARCH
   # TODO unreached code, test and fix this
   ifeq ($(shell uname -m),armv7l)
@@ -110,7 +112,6 @@ ifndef ARCH
     ARCH             = x86_64
     SYSTEM_LIBDIR_NAME      = lib64
   else
-    ARCH_32                 = i586
     ARCH                    = $(ARCH_32)
     SYSTEM_LIBDIR_NAME      = lib
   endif