Bug 1308092 - Deferred assignment for OBJDIR_NAME, r=franziskus
authorMartin Thomson <martin.thomson@gmail.com>
Fri, 07 Oct 2016 20:14:57 +1100
changeset 12688 7a3e3d62e21a81bfecdcf7b647a01de06ca737ca
parent 12687 95a0d57f827161d7401877198113bb668536461d
child 12689 6ae8579cc6cdf25436d2722577bf9d0c6fb06877
push id1642
push usermartin.thomson@gmail.com
push dateFri, 07 Oct 2016 09:16:09 +0000
reviewersfranziskus
bugs1308092
Bug 1308092 - Deferred assignment for OBJDIR_NAME, r=franziskus
coreconf/arch.mk
--- a/coreconf/arch.mk
+++ b/coreconf/arch.mk
@@ -264,17 +264,17 @@ ifeq ($(USE_GCOV), 1)
 else
     GCOV_TAG =
 endif
 ifeq ($(USE_64), 1)
     64BIT_TAG = _64
 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
 else
     ifdef BUILD_IDG
 	OBJDIR_TAG = $(OBJDIR_TAG_BASE)_IDG
     else
 	OBJDIR_TAG = $(OBJDIR_TAG_BASE)_DBG
@@ -285,30 +285,30 @@ endif
 # The following flags are defined in the individual $(OS_CONFIG).mk
 # files.
 #
 # CPU_TAG is defined if the CPU is not the most common CPU.
 # COMPILER_TAG is defined if the compiler is not the default compiler.
 # 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)))
 ifndef BUILD_OPT
 #
 # Define USE_DEBUG_RTL if you want to use the debug runtime library
 # (RTL) in the debug build
 #
 ifdef USE_DEBUG_RTL
-    OBJDIR_NAME := $(OBJDIR_NAME)D
+    OBJDIR_NAME = $(OBJDIR_NAME_BASE).OBJD
 endif
 endif
 endif
 
 MK_ARCH = included