diff --git a/config/CONFIG_COMMON b/config/CONFIG_COMMON
index 73468784c..def30821b 100644
--- a/config/CONFIG_COMMON
+++ b/config/CONFIG_COMMON
@@ -9,15 +9,15 @@
 
 # Common Configuration Information 
 
-BUILD_ARCHS=$(HOST_ARCH)
-ifndef CROSS_COMPILER_HOST_ARCHS
-     BUILD_ARCHS+=$(CROSS_COMPILER_TARGET_ARCHS)
-else
-     ifeq ($(HOST_ARCH),$(findstring $(HOST_ARCH),$(CROSS_COMPILER_HOST_ARCHS)))
-          BUILD_ARCHS+=$(CROSS_COMPILER_TARGET_ARCHS)
-     endif
-endif
-
+# CROSS1 will be defined only when CROSS_COMPILER_HOST_ARCHS is NOT defined
+CROSS1 = $(CROSS_COMPILER_TARGET_ARCHS$(word 1,$(CROSS_COMPILER_HOST_ARCHS)))
+ 
+# CROSS2 will be defined only when CROSS_COMPILER_HOST_ARCHS is defined
+# and HOST_ARCH is one of it's words  
+CROSS2 = $(CROSS_COMPILER_TARGET_ARCHS$(filter-out 1,$(words $(filter $(HOST_ARCH),$(CROSS_COMPILER_HOST_ARCHS)))))
+ 
+BUILD_ARCHS = $(HOST_ARCH) $(CROSS1) $(CROSS2)
+ 
 INSTALL_LOCATION = $(TOP)
  
 INSTALL_LOCATION_LIB        = $(INSTALL_LOCATION)/lib