Bug 185436 - "Software update for release builds" [p=smorgan sr=pink a1.9=beltzner]

config/config.mk

@@ -681,10 +681,7 @@ PBBUILD = NEXT_ROOT= $(PBBUILD_BIN)
 else # NEXT_ROOT
 PBBUILD = $(PBBUILD_BIN)
 endif # NEXT_ROOT
-PBBUILD_SETTINGS = GCC_VERSION="$(GCC_VERSION)" SYMROOT=build
-ifdef CROSS_COMPILE
-PBBUILD_SETTINGS += ARCHS="$(OS_TEST)"
-endif # CROSS_COMPILE
+PBBUILD_SETTINGS = GCC_VERSION="$(GCC_VERSION)" SYMROOT=build ARCHS="$(OS_TEST)"
 ifdef MACOS_SDK_DIR
 PBBUILD_SETTINGS += SDKROOT="$(MACOS_SDK_DIR)"
 endif # MACOS_SDK_DIR