Bugzilla Bug 312202: figured out a better way to do OBJDIR_NAME for NSS_3_10_2_PORTING_BRANCH
authorwtchang%redhat.com
Tue, 15 Nov 2005 00:11:33 +0000
branchNSS_3_10_2_PORTING_BRANCH
changeset 6299 8b51443b0506fd17fc7ce627cce79cdd341dfa1b
parent 6290 7db191bb01cf8857359dfc3d8faefb30cd2a77ab
child 6302 616fa4254495e1e6ea60864464b4a372a29ad367
push idunknown
push userunknown
push dateunknown
bugs312202
Bugzilla Bug 312202: figured out a better way to do OBJDIR_NAME for HP-UX ia64. Modified Files: HP-UX.mk arch.mk Tag: NSS_3_10_2_PORTING_BRANCH
security/coreconf/HP-UX.mk
security/coreconf/arch.mk
--- a/security/coreconf/HP-UX.mk
+++ b/security/coreconf/HP-UX.mk
@@ -41,16 +41,19 @@
 
 include $(CORE_DEPTH)/coreconf/UNIX.mk
 
 DEFAULT_COMPILER = cc
 
 ifeq ($(OS_TEST),ia64)
 	CPU_ARCH = ia64
 	CPU_TAG  = _$(CPU_ARCH)
+	ifneq ($(USE_64), 1)
+		64BIT_TAG=_32
+	endif
 	DLL_SUFFIX = so
 else
 	CPU_ARCH = hppa
 	DLL_SUFFIX = sl
 endif
 CC         = cc
 CCC        = CC
 OS_CFLAGS  += -Ae $(DSO_CFLAGS) -DHPUX -D$(CPU_ARCH) -D_HPUX_SOURCE -D_USE_BIG_FDS
--- a/security/coreconf/arch.mk
+++ b/security/coreconf/arch.mk
@@ -33,31 +33,37 @@
 # the provisions above, a recipient may use your version of this file under
 # the terms of any one of the MPL, the GPL or the LGPL.
 #
 # ***** END LICENSE BLOCK *****
 
 #######################################################################
 # 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
-# 64BIT_TAG
 # OBJDIR_TAG
 # OBJDIR_NAME
 #######################################################################
 
 #
 # Macros for getting the OS architecture
 #
 
+ifeq ($(USE_64), 1)
+	64BIT_TAG=_64
+else
+	64BIT_TAG=
+endif
+
 OS_ARCH := $(subst /,_,$(shell uname -s))
 
 #
 # Attempt to differentiate between sparc and x86 Solaris
 #
 
 OS_TEST := $(shell uname -m)
 ifeq ($(OS_TEST),i86pc)
@@ -281,37 +287,16 @@ endif
 
 #
 # This variable is used to get OS_CONFIG.mk.
 #
 
 OS_CONFIG = $(OS_TARGET)$(OS_RELEASE)
 
 #
-# 64BIT_TAG distinguishes between 32-bit and 64-bit builds.
-#
-
-ifeq ($(USE_64), 1)
-    64BIT_TAG=_64
-else
-    64BIT_TAG=
-endif
-
-#
-# Changes for HP-UX ia64
-#
-ifeq ($(OS_ARCH), HP-UX)
-    ifeq ($(OS_TEST), ia64)
-	ifneq ($(USE_64), 1)
-	    64BIT_TAG=_32
-	endif
-    endif
-endif
-
-#
 # OBJDIR_TAG depends on the predefined variable BUILD_OPT,
 # to distinguish between debug and release builds.
 #
 
 ifdef BUILD_OPT
     ifeq ($(OS_TARGET),WIN16)
 	OBJDIR_TAG = _O
     else