diff options
| author | Kai Engert <kaie@kuix.de> | 2015-10-06 18:44:56 +0200 |
|---|---|---|
| committer | Kai Engert <kaie@kuix.de> | 2015-10-06 18:44:56 +0200 |
| commit | bac3ba836dcfaa1990e3a7634f42bcac9188f9b5 (patch) | |
| tree | f969a1f77097e72f36a4587111a80caaca1fd0a2 /coreconf | |
| parent | 6b32ef5ce23dd62db2a518428d0436b97d51a85c (diff) | |
| download | nss-hg-bac3ba836dcfaa1990e3a7634f42bcac9188f9b5.tar.gz | |
Bug 1211915 - Fix nsinstall object directory when cross compiling
Diffstat (limited to 'coreconf')
| -rw-r--r-- | coreconf/arch.mk | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/coreconf/arch.mk b/coreconf/arch.mk index 782e6c035..62ba8d5dd 100644 --- a/coreconf/arch.mk +++ b/coreconf/arch.mk @@ -280,7 +280,12 @@ endif # IMPL_STRATEGY may be defined too. # +ifdef CROSS_COMPILE +OBJDIR_NAME = $(OS_TARGET)$(OS_RELEASE)$(CPU_TAG)$(LIBC_TAG)$(IMPL_STRATEGY)$(OBJDIR_TAG).OBJ +else OBJDIR_NAME = $(OS_TARGET)$(OS_RELEASE)$(CPU_TAG)$(COMPILER_TAG)$(LIBC_TAG)$(IMPL_STRATEGY)$(OBJDIR_TAG).OBJ +endif + ifeq (,$(filter-out WIN%,$(OS_TARGET))) ifndef BUILD_OPT @@ -289,7 +294,11 @@ 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 endif endif endif |