diff options
| author | Lorry Tar Creator <lorry-tar-importer@lorry> | 2017-01-04 14:24:24 +0000 |
|---|---|---|
| committer | Lorry Tar Creator <lorry-tar-importer@lorry> | 2017-01-04 14:24:24 +0000 |
| commit | dc1565216a5d20ae0d75872151523252309a1292 (patch) | |
| tree | d57454ba9a40386552179eddf60d28bd1e8f3d54 /nss/coreconf/arch.mk | |
| parent | 26c046fbc57d53136b4fb3b5e0d18298318125d4 (diff) | |
| download | nss-dc1565216a5d20ae0d75872151523252309a1292.tar.gz | |
nss-3.28.1nss-3.28.1
Diffstat (limited to 'nss/coreconf/arch.mk')
| -rw-r--r-- | nss/coreconf/arch.mk | 52 |
1 files changed, 30 insertions, 22 deletions
diff --git a/nss/coreconf/arch.mk b/nss/coreconf/arch.mk index 62ba8d5..06c276f 100644 --- a/nss/coreconf/arch.mk +++ b/nss/coreconf/arch.mk @@ -6,14 +6,13 @@ ####################################################################### # Master "Core Components" macros for getting the OS architecture # # defines these symbols: -# 64BIT_TAG # OS_ARCH (from uname -r) # OS_TEST (from uname -m) # OS_RELEASE (from uname -v and/or -r) # OS_TARGET User defined, or set to OS_ARCH # CPU_ARCH (from unmame -m or -p, ONLY on WINNT) # OS_CONFIG OS_TARGET + OS_RELEASE -# OBJDIR_TAG +# OBJDIR_TAG (uses ASAN_TAG, GCOV_TAG, 64BIT_TAG) # OBJDIR_NAME ####################################################################### @@ -21,12 +20,6 @@ # Macros for getting the OS architecture # -ifeq ($(USE_64), 1) - 64BIT_TAG=_64 -else - 64BIT_TAG= -endif - OS_ARCH := $(subst /,_,$(shell uname -s)) # @@ -205,11 +198,11 @@ ifeq (CYGWIN_NT,$(findstring CYGWIN_NT,$(OS_ARCH))) endif endif # -# If uname -s returns "MINGW32_NT-*", we assume that we are using +# If uname -s returns "MINGW*_NT-*", we assume that we are using # the uname.exe in the MSYS toolkit. # -ifeq (MINGW32_NT,$(findstring MINGW32_NT,$(OS_ARCH))) - OS_RELEASE := $(patsubst MINGW32_NT-%,%,$(OS_ARCH)) +ifneq (,$(filter MINGW32_NT-% MINGW64_NT-%,$(OS_ARCH))) + OS_RELEASE := $(patsubst MINGW64_NT-%,%,$(patsubst MINGW32_NT-%,%,$(OS_ARCH))) OS_ARCH = WINNT USE_MSYS = 1 ifndef CPU_ARCH @@ -217,7 +210,7 @@ ifeq (MINGW32_NT,$(findstring MINGW32_NT,$(OS_ARCH))) # # MSYS's uname -m returns "i686" on a Pentium Pro machine. # - ifneq (,$(findstring 86,$(CPU_ARCH))) + ifneq (,$(filter i%86,$(CPU_ARCH))) CPU_ARCH = x386 endif endif @@ -261,13 +254,30 @@ OS_CONFIG = $(OS_TARGET)$(OS_RELEASE) # to distinguish between debug and release builds. # +ifeq ($(USE_ASAN), 1) + ASAN_TAG = _ASAN +else + ASAN_TAG = +endif +ifeq ($(USE_GCOV), 1) + GCOV_TAG = _GCOV +else + GCOV_TAG = +endif +ifeq ($(USE_64), 1) + 64BIT_TAG = _64 +else + 64BIT_TAG = +endif +OBJDIR_TAG_BASE=$(ASAN_TAG)$(GCOV_TAG)$(64BIT_TAG) + ifdef BUILD_OPT - OBJDIR_TAG = $(64BIT_TAG)_OPT + OBJDIR_TAG = $(OBJDIR_TAG_BASE)_OPT else ifdef BUILD_IDG - OBJDIR_TAG = $(64BIT_TAG)_IDG + OBJDIR_TAG = $(OBJDIR_TAG_BASE)_IDG else - OBJDIR_TAG = $(64BIT_TAG)_DBG + OBJDIR_TAG = $(OBJDIR_TAG_BASE)_DBG endif endif @@ -281,10 +291,12 @@ endif # ifdef CROSS_COMPILE -OBJDIR_NAME = $(OS_TARGET)$(OS_RELEASE)$(CPU_TAG)$(LIBC_TAG)$(IMPL_STRATEGY)$(OBJDIR_TAG).OBJ + OBJDIR_NAME_COMPILER = else -OBJDIR_NAME = $(OS_TARGET)$(OS_RELEASE)$(CPU_TAG)$(COMPILER_TAG)$(LIBC_TAG)$(IMPL_STRATEGY)$(OBJDIR_TAG).OBJ + 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))) @@ -294,11 +306,7 @@ ifndef BUILD_OPT # (RTL) in the debug build # ifdef USE_DEBUG_RTL - ifdef CROSS_COMPILE - OBJDIR_NAME = $(OS_TARGET)$(OS_RELEASE)$(CPU_TAG)$(IMPL_STRATEGY)$(OBJDIR_TAG).OBJD - else - OBJDIR_NAME = $(OS_TARGET)$(OS_RELEASE)$(CPU_TAG)$(COMPILER_TAG)$(IMPL_STRATEGY)$(OBJDIR_TAG).OBJD - endif + OBJDIR_NAME = $(OBJDIR_NAME_BASE).OBJD endif endif endif |