Bug 1308092 - Deferred assignment for OBJDIR_NAME, r=franziskus

--HG--
extra : rebase_source : acb1ede9184b38dda8a05aced6ba809f4c180cb7

coreconf/arch.mk

@@ -269,7 +269,7 @@ ifeq ($(USE_64), 1)
 else
     64BIT_TAG =
 endif
-OBJDIR_TAG_BASE=$(64BIT_TAG)$(ASAN_TAG)$(GCOV_TAG)
+OBJDIR_TAG_BASE=$(ASAN_TAG)$(GCOV_TAG)$(64BIT_TAG)
 
 ifdef BUILD_OPT
     OBJDIR_TAG = $(OBJDIR_TAG_BASE)_OPT
@@ -290,13 +290,13 @@ endif
 # IMPL_STRATEGY may be defined too.
 #
 
-OBJDIR_NAME_PREFIX = $(OS_TARGET)$(OS_RELEASE)$(CPU_TAG)
-OBJDIR_NAME_SUFFIX = $(LIBC_TAG)$(IMPL_STRATEGY)$(OBJDIR_TAG).OBJ
 ifdef CROSS_COMPILE
-    OBJDIR_NAME := $(OBJDIR_NAME_PREFIX)$(LIBC_TAG)$(OBJDIR_NAME_SUFFIX)
+    OBJDIR_NAME_COMPILER =
 else
-    OBJDIR_NAME := $(OBJDIR_NAME_PREFIX)$(COMPILER_TAG)$(OBJDIR_NAME_SUFFIX)
+    OBJDIR_NAME_COMPILER = $(COMPILER_TAG)
 endif
+OBJDIR_NAME_BASE = $(OS_TARGET)$(OS_RELEASE)$(CPU_TAG)$(OBJDIR_NAME_COMPILER)$(LIBC_TAG)$(IMPL_STRATEGY)$(OBJDIR_TAG)
+OBJDIR_NAME = $(OBJDIR_NAME_BASE).OBJ
 
 
 ifeq (,$(filter-out WIN%,$(OS_TARGET)))
@@ -306,7 +306,7 @@ ifndef BUILD_OPT
 # (RTL) in the debug build
 #
 ifdef USE_DEBUG_RTL
-    OBJDIR_NAME := $(OBJDIR_NAME)D
+    OBJDIR_NAME = $(OBJDIR_NAME_BASE).OBJD
 endif
 endif
 endif