Change most coreconf and NSS makefiles to use OS_TARGET (which can

be overridden via an environment variable) rather than OS_ARCH.
This is a precursor to more flexibility in cross-platform builds.
Bug 104541.

24 files changed, 84 insertions, 121 deletions

diff --git a/security/nss/Makefile b/security/nss/Makefile
index 6e18827cd..d7373ed82 100644
--- a/security/nss/Makefile
+++ b/security/nss/Makefile
@@ -54,7 +54,9 @@ include $(CORE_DEPTH)/coreconf/config.mk
 # (4) Include "local" platform-dependent assignments (OPTIONAL).      #
 #######################################################################
 
-
+ifeq ($(OS_TARGET),WINCE)
+DIRS	= lib	# omit cmd since wince has no command line shell
+endif
 
 #######################################################################
 # (5) Execute "global" rules. (OPTIONAL)                              #
@@ -114,7 +116,7 @@ endif
 #
 
 USEABSPATH="YES"
-ifeq ($(OS_ARCH),WINNT)
+ifeq (,$(filter-out WIN%,$(OS_TARGET)))
 ifeq (,$(findstring :,$(shell pwd)))
 USEABSPATH="NO"
 endif
@@ -149,7 +151,7 @@ build_dbm:
 	
 
 moz_import::
-ifeq ($(OS_ARCH),WINNT)
+ifeq (,$(filter-out WIN%,$(OS_TARGET)))
 	$(NSINSTALL) -D $(DIST)/include/nspr
 	cp $(DIST)/../include/nspr/*.h $(DIST)/include/nspr
 	cp $(DIST)/../include/* $(DIST)/include
@@ -160,7 +162,7 @@ else
 endif
 	mv $(DIST)/lib/dbm32.lib $(DIST)/lib/dbm.lib
 else
-ifeq ($(OS_ARCH),OS2)
+ifeq ($(OS_TARGET),OS2)
 	cp -rf $(DIST)/../include $(DIST)
 	cp -rf $(DIST)/../lib $(DIST)
 	cp -f $(DIST)/lib/libmozdbm_s.$(LIB_SUFFIX) $(DIST)/lib/libdbm.$(LIB_SUFFIX)
diff --git a/security/nss/cmd/Makefile b/security/nss/cmd/Makefile
index dd012940e..5e716b9b3 100644
--- a/security/nss/cmd/Makefile
+++ b/security/nss/cmd/Makefile
@@ -149,7 +149,7 @@ TARGETS = $(NON_DIRS)
 include $(CORE_DEPTH)/coreconf/rules.mk
 
 
-ifneq ($(OS_ARCH),OS2)
+ifneq ($(OS_TARGET),OS2)
 $(OBJDIR)/%-us.o: %.c
 	@$(MAKE_OBJDIR)
 	$(CCF) -o $@ $(US_FLAGS) -c $*.c
diff --git a/security/nss/cmd/crmf-cgi/Makefile b/security/nss/cmd/crmf-cgi/Makefile
index cc2f035d6..23cb6f6b5 100644
--- a/security/nss/cmd/crmf-cgi/Makefile
+++ b/security/nss/cmd/crmf-cgi/Makefile
@@ -35,7 +35,7 @@
 #######################################################################
 # (1) Include initial platform-independent assignments (MANDATORY).   #
 #######################################################################
-ifeq ($(OS_ARCH), WINNT)
+ifeq (,$(filter-out WIN%,$(OS_TARGET)))
 EXTRA_LIBS += $(DIST)/lib/crmf.lib
 else
 EXTRA_LIBS += $(DIST)/lib/libcrmf.$(LIB_SUFFIX) 
diff --git a/security/nss/cmd/crmftest/Makefile b/security/nss/cmd/crmftest/Makefile
index 9eae3715a..5df669763 100644
--- a/security/nss/cmd/crmftest/Makefile
+++ b/security/nss/cmd/crmftest/Makefile
@@ -55,15 +55,15 @@ include $(CORE_DEPTH)/coreconf/config.mk
 #######################################################################
 include config.mk
 
-ifeq ($(OS_ARCH)$(OS_RELEASE), AIX4.2)
+ifeq ($(OS_TARGET)$(OS_RELEASE), AIX4.2)
 OS_LIBS += -lsvld 
 endif 
 
-ifeq ($(OS_ARCH)$(OS_RELEASE), SunOS5.6)
+ifeq ($(OS_TARGET)$(OS_RELEASE), SunOS5.6)
 OS_LIBS += -ldl -lxnet -lposix4 -lsocket -lnsl
 endif
 
-ifeq ($(OS_ARCH), WINNT)
+ifeq (,$(filter-out WIN%,$(OS_TARGET)))
 EXTRA_LIBS += $(DIST)/lib/crmf.lib
 else
 EXTRA_LIBS += $(DIST)/lib/libcrmf.$(LIB_SUFFIX) 
@@ -89,7 +89,7 @@ include $(CORE_DEPTH)/coreconf/rules.mk
 
 LDDIST = $(DIST)/lib
 
-ifeq ($(OS_ARCH), WINNT)
+ifeq (,$(filter-out WIN%,$(OS_TARGET)))
 EXTRA_LIBS += $(LDDIST)/sectool.lib
 endif
 
diff --git a/security/nss/cmd/dbtest/Makefile b/security/nss/cmd/dbtest/Makefile
index ed30c638a..0d4b54c29 100644
--- a/security/nss/cmd/dbtest/Makefile
+++ b/security/nss/cmd/dbtest/Makefile
@@ -58,7 +58,7 @@ ifdef XP_OS2_VACPP
 CFLAGS += -I../modutil
 endif
 
-ifeq ($(OS_ARCH), WINNT)
+ifeq (,$(filter-out WINNT WIN95 WIN16,$(OS_TARGET)))  # omits WINCE
 ifndef BUILD_OPT
 LDFLAGS   +=  /subsystem:console /profile /debug /machine:I386 /incremental:no
 OS_CFLAGS += -D_CONSOLE
diff --git a/security/nss/cmd/modutil/config.mk b/security/nss/cmd/modutil/config.mk
index 3da32a667..9f0cdf1e4 100644
--- a/security/nss/cmd/modutil/config.mk
+++ b/security/nss/cmd/modutil/config.mk
@@ -58,9 +58,9 @@ LDFLAGS = \
 
 # Strip out the symbols
 ifdef BUILD_OPT
-	ifneq ($(OS_ARCH),WINNT)
-		LDFLAGS += -s
-	endif
+    ifneq (,$(filter-out WIN%,$(OS_TARGET)))
+	LDFLAGS += -s
+    endif
 endif
 
 #######################################################################
@@ -68,10 +68,10 @@ endif
 #######################################################################
  
 
-ifeq ($(OS_ARCH),WINNT)
-	PACKAGE_FILES = license.txt README.TXT specification.html pk11jar.html modutil.exe
+ifeq (,$(filter-out WIN%,$(OS_TARGET)))
+    PACKAGE_FILES = license.txt README.TXT specification.html pk11jar.html modutil.exe
 else
-	PACKAGE_FILES = license.doc README specification.html pk11jar.html modutil
+    PACKAGE_FILES = license.doc README specification.html pk11jar.html modutil
 endif
 
-ARCHIVE_NAME = modutil_$(OS_CONFIG)
+ARCHIVE_NAME = modutil_$(OS_TARGET)$(OS_RELEASE)
diff --git a/security/nss/cmd/rsaperf/Makefile b/security/nss/cmd/rsaperf/Makefile
index cf93911eb..1a555a2fe 100644
--- a/security/nss/cmd/rsaperf/Makefile
+++ b/security/nss/cmd/rsaperf/Makefile
@@ -53,7 +53,7 @@ include $(CORE_DEPTH)/coreconf/config.mk
 #######################################################################
 include ../platlibs.mk
 
-ifeq ($(OS_ARCH), WINNT)
+ifeq (,$(filter-out WINNT WIN95 WIN16,$(OS_TARGET)))  #omits WINCE
 ifndef BUILD_OPT
 LDFLAGS   +=  /subsystem:console /profile /debug /machine:I386 /incremental:no
 OS_CFLAGS += -D_CONSOLE
diff --git a/security/nss/cmd/tstclnt/Makefile b/security/nss/cmd/tstclnt/Makefile
index 7e236b453..8a0332d89 100644
--- a/security/nss/cmd/tstclnt/Makefile
+++ b/security/nss/cmd/tstclnt/Makefile
@@ -54,7 +54,7 @@ include $(CORE_DEPTH)/coreconf/config.mk
 
 include ../platlibs.mk
 
-ifeq ($(OS_ARCH), WINNT)
+ifeq (,$(filter-out WINNT WIN95 WIN16,$(OS_TARGET)))  # omits WINCE
 ifndef BUILD_OPT
 LDFLAGS   +=  /subsystem:console /profile /debug /machine:I386 /incremental:no
 OS_CFLAGS += -D_CONSOLE
diff --git a/security/nss/cmd/zlib/config.mk b/security/nss/cmd/zlib/config.mk
index 090b93d70..a1c67fdb4 100644
--- a/security/nss/cmd/zlib/config.mk
+++ b/security/nss/cmd/zlib/config.mk
@@ -46,17 +46,20 @@ PROGRAM        =
 # library names, and all special system linking options               #
 #######################################################################
 
-SECTOOLS_LIBS = $(LDOPTS) $(LIBSSL) $(LIBPKCS7) $(LIBCERT) $(LIBKEY) $(LIBSECMOD) $(LIBCRYPTO) $(LIBSECUTIL) $(LIBSECMOD) $(LIBSSL) $(LIBPKCS7) $(LIBCERT) $(LIBKEY) $(LIBCRYPTO) $(LIBSECUTIL) $(LIBHASH) $(LIBDBM) $(DLLPLC) $(DLLPLDS) $(DLLPR) $(DLLSYSTEM)
+SECTOOLS_LIBS = $(LDOPTS) $(LIBSSL) $(LIBPKCS7) $(LIBCERT) $(LIBKEY) \
+    $(LIBSECMOD) $(LIBCRYPTO) $(LIBSECUTIL) $(LIBSECMOD) $(LIBSSL) \
+    $(LIBPKCS7) $(LIBCERT) $(LIBKEY) $(LIBCRYPTO) $(LIBSECUTIL) \
+    $(LIBHASH) $(LIBDBM) $(DLLPLC) $(DLLPLDS) $(DLLPR) $(DLLSYSTEM)
 
-ifeq ($(OS_ARCH),AIX)
+ifeq ($(OS_TARGET),AIX)
 	OS_LIBS += $(SECTOOLS_LIBS)
 endif
 
-ifeq ($(OS_ARCH),NCR)
+ifeq ($(OS_TARGET),NCR)
 	OS_LIBS += $(SECTOOLS_LIBS)
 endif
 
-ifeq ($(OS_ARCH),SCO_SV)
+ifeq ($(OS_TARGET),SCO_SV)
 	OS_LIBS += $(SECTOOLS_LIBS)
 endif
 
diff --git a/security/nss/lib/ckfw/builtins/Makefile b/security/nss/lib/ckfw/builtins/Makefile
index ca036297f..d58e910d9 100644
--- a/security/nss/lib/ckfw/builtins/Makefile
+++ b/security/nss/lib/ckfw/builtins/Makefile
@@ -41,8 +41,8 @@ EXTRA_LIBS = \
 	$(DIST)/lib/$(LIB_PREFIX)nssb.$(LIB_SUFFIX) \
 	$(NULL)
 
-# can't do this in manifest.mn because OS_ARCH isn't defined there.
-ifeq ($(OS_ARCH), WINNT)
+# can't do this in manifest.mn because OS_TARGET isn't defined there.
+ifeq (,$(filter-out WIN%,$(OS_TARGET)))
 
 EXTRA_LIBS += \
 	$(DIST)/lib/$(NSPR31_LIB_PREFIX)plc4_s.lib \
@@ -71,7 +71,7 @@ generate:
 # This'll need some help from a build person.
 
 
-ifeq ($(OS_ARCH)$(OS_RELEASE), AIX4.1)
+ifeq ($(OS_TARGET)$(OS_RELEASE), AIX4.1)
 DSO_LDOPTS              = -bM:SRE -bh:4 -bnoentry
 EXTRA_DSO_LDOPTS        = -lc
 MKSHLIB                 = xlC $(DSO_LDOPTS)
@@ -84,7 +84,7 @@ $(SHARED_LIBRARY): $(OBJS)
 
 endif
 
-ifeq ($(OS_ARCH)$(OS_RELEASE), AIX4.2)
+ifeq ($(OS_TARGET)$(OS_RELEASE), AIX4.2)
 LD      += -G
 endif 
 
diff --git a/security/nss/lib/ckfw/builtins/config.mk b/security/nss/lib/ckfw/builtins/config.mk
index 29063b0fd..cccc96eb8 100644
--- a/security/nss/lib/ckfw/builtins/config.mk
+++ b/security/nss/lib/ckfw/builtins/config.mk
@@ -42,17 +42,17 @@ LIBRARY        =
 IMPORT_LIBRARY =
 PROGRAM        =
 
-ifeq (,$(filter-out OS2 WINNT,$(OS_ARCH)))
-	SHARED_LIBRARY = $(OBJDIR)/$(LIBRARY_NAME)$(LIBRARY_VERSION).dll
+ifeq (,$(filter-out OS2 WIN%,$(OS_TARGET)))
+    SHARED_LIBRARY = $(OBJDIR)/$(LIBRARY_NAME)$(LIBRARY_VERSION).dll
 endif
 
 ifdef BUILD_IDG
-DEFINES += -DNSSDEBUG
+    DEFINES += -DNSSDEBUG
 endif
 
 #
 # To create a loadable module on Darwin, we must use -bundle.
 #
-ifeq ($(OS_ARCH),Darwin)
+ifeq ($(OS_TARGET),Darwin)
 DSO_LDOPTS := $(subst -dynamiclib,-bundle,$(DSO_LDOPTS))
 endif
diff --git a/security/nss/lib/fortcrypt/Makefile b/security/nss/lib/fortcrypt/Makefile
index 32b8df58d..40609cb98 100644
--- a/security/nss/lib/fortcrypt/Makefile
+++ b/security/nss/lib/fortcrypt/Makefile
@@ -37,9 +37,9 @@ include $(CORE_DEPTH)/coreconf/config.mk
 include config.mk
 
 CILIB                   = $(OBJDIR)/cilib.$(LIB_SUFFIX)
-ORIG_CILIB              = libci/$(OS_CONFIG).$(LIB_SUFFIX)
+ORIG_CILIB              = libci/$(OS_TARGET)$(OS_RELEASE).$(LIB_SUFFIX)
 
-ifeq ($(OS_ARCH), WINNT)
+ifeq (,$(filter-out WINNT WINCE,$(OS_TARGET)))  # omits WIN16 WIN95
 ORIG_CILIB              = libci/tssp32.lib
 endif
 
@@ -51,7 +51,7 @@ ifeq ($(OS_TARGET), WIN95)
 ORIG_CILIB              = libci/tssp32.lib
 endif
 
-ifeq ($(OS_ARCH), WINNT)
+ifeq (,$(filter-out WIN%,$(OS_TARGET)))
 STUBDLL                 = $(OBJDIR)/stub.$(DLL_SUFFIX)
 endif
 
@@ -100,14 +100,14 @@ $(CILIB):
 
 $(STUBLIB): $(OBJDIR)/maci$(OBJ_SUFFIX)
 	@$(MAKE_OBJDIR)
-ifeq ($(OS_ARCH), WINNT)
+ifeq (,$(filter-out WIN%,$(OS_TARGET)))
 	$(MAKE) $(STUBDLL)
 else
 	$(AR) $<
 endif
 	cp $@ $(CILIB)
 
-ifeq ($(OS_ARCH), WINNT)
+ifeq (,$(filter-out WIN%,$(OS_TARGET)))
 $(STUBDLL): $(OBJDIR)/maci.o
 	$(LINK_DLL) -MAP $(DLLBASE) $(subst /,\\,$(OBJDIR)/maci.o $(OS_LIBS))
 
@@ -142,7 +142,7 @@ MD_FILES += $(LIBCI_JAR)
 # so I'm going to override their shared library command and build the shared
 # library the way config used to.
 #
-ifeq ($(OS_ARCH)$(OS_RELEASE), AIX4.1)
+ifeq ($(OS_TARGET)$(OS_RELEASE), AIX4.1)
 DSO_LDOPTS              = -bM:SRE -bh:4 -bnoentry
 EXTRA_DSO_LDOPTS        = -lc
 MKSHLIB                 = svld $(DSO_LDOPTS)
@@ -154,7 +154,7 @@ $(SHARED_LIBRARY): $(OBJS)
 	chmod +x $@
 endif
 
-ifeq ($(OS_ARCH)$(OS_RELEASE), AIX4.2)
+ifeq ($(OS_TARGET)$(OS_RELEASE), AIX4.2)
 LD      += -G
 endif 
 
diff --git a/security/nss/lib/fortcrypt/swfort/pkcs11/Makefile b/security/nss/lib/fortcrypt/swfort/pkcs11/Makefile
index 8af29d6b5..c148b325c 100644
--- a/security/nss/lib/fortcrypt/swfort/pkcs11/Makefile
+++ b/security/nss/lib/fortcrypt/swfort/pkcs11/Makefile
@@ -36,11 +36,11 @@ include manifest.mn
 include $(CORE_DEPTH)/coreconf/config.mk
 include config.mk
 
-
 CRYPTO_LIB = $(DIST)/lib/$(LIB_PREFIX)freebl.$(LIB_SUFFIX) 
+#SWCILI    = ../$(OBJDIR)/$(LIB_PREFIX)swfci.$(LIB_SUFFIX)
 
-# can't do this in manifest.mn because OS_ARCH isn't defined there.
-ifeq ($(OS_ARCH), WINNT)
+# can't do this in manifest.mn because OS_TARGET isn't defined there.
+ifeq (,$(filter-out WIN%,$(OS_TARGET)))
 
 ifdef MOZILLA_SECURITY_BUILD
 CRYPTO_LIB = $(DIST)/lib/crypto.lib
@@ -134,7 +134,7 @@ MD_FILES += $(LIBCI_JAR) $(LIBSWCI_JAR)
 #
 
 
-ifeq ($(OS_ARCH)$(OS_RELEASE), AIX4.1)
+ifeq ($(OS_TARGET)$(OS_RELEASE), AIX4.1)
 DSO_LDOPTS              = -bM:SRE -bh:4 -bnoentry
 EXTRA_DSO_LDOPTS        = -lc
 MKSHLIB                 = xlC $(DSO_LDOPTS)
@@ -147,7 +147,7 @@ $(SHARED_LIBRARY): $(OBJS)
 
 endif
 
-ifeq ($(OS_ARCH)$(OS_RELEASE), AIX4.2)
+ifeq ($(OS_TARGET)$(OS_RELEASE), AIX4.2)
 LD      += -G
 endif 
 
diff --git a/security/nss/lib/freebl/Makefile b/security/nss/lib/freebl/Makefile
index 34cbecf84..eaaff9658 100644
--- a/security/nss/lib/freebl/Makefile
+++ b/security/nss/lib/freebl/Makefile
@@ -67,21 +67,23 @@ endif
 # des.c wants _X86_ defined for intel CPUs.  
 # coreconf does this for windows, but not for Linux, FreeBSD, etc.
 ifeq ($(CPU_ARCH),x86)
-ifneq ($(OS_ARCH),WINNT)
+ifneq (,$(filter-out WIN%,$(OS_TARGET)))
 	OS_REL_CFLAGS += -D_X86_
 endif
 endif
 
-ifeq ($(OS_ARCH),OSF1)
+ifeq ($(OS_TARGET),OSF1)
     DEFINES += -DMP_ASSEMBLY_MULTIPLY -DMP_NO_MP_WORD
     MPI_SRCS += mpvalpha.c
 endif
 
-ifeq ($(OS_ARCH),WINNT)
-ifneq ($(OS_TARGET),WIN16)
+ifeq (,$(filter-out WINNT WIN95,$(OS_TARGET)))  #omits WIN16 and WINCE
     ASFILES  = mpi_x86.asm
     DEFINES += -DMP_ASSEMBLY_MULTIPLY -DMP_ASSEMBLY_SQUARE -DMP_ASSEMBLY_DIV_2DX1D
 endif
+
+ifeq ($(OS_TARGET),WINCE)
+    DEFINES += -DMP_ARGCHK=0	# no assert in WinCE
 endif
 
 ifdef XP_OS2_VACPP
@@ -89,7 +91,7 @@ ifdef XP_OS2_VACPP
     DEFINES += -DMP_ASSEMBLY_MULTIPLY -DMP_ASSEMBLY_SQUARE -DMP_ASSEMBLY_DIV_2DX1D -DMP_USE_UINT_DIGIT -DMP_NO_MP_WORD
 endif
 
-ifeq ($(OS_ARCH),IRIX)
+ifeq ($(OS_TARGET),IRIX)
 ifeq ($(USE_N32),1)
     ASFILES  = mpi_mips.s
 ifeq ($(NS_USE_GCC),1)
@@ -110,14 +112,14 @@ ifeq ($(CPU_ARCH),x86)
 endif
 endif
 
-ifeq ($(OS_ARCH),AIX)
+ifeq ($(OS_TARGET),AIX)
 DEFINES += -DMP_USE_UINT_DIGIT
 ifndef USE_64
 DEFINES += -DMP_NO_DIV_WORD -DMP_NO_ADD_WORD -DMP_NO_SUB_WORD
 endif
 endif
 
-ifeq ($(OS_ARCH), HP-UX)
+ifeq ($(OS_TARGET), HP-UX)
 MKSHLIB += +k +vshlibunsats -u FREEBL_GetVector +e FREEBL_GetVector
 ifndef FREEBL_EXTENDED_BUILD
 ifdef USE_PURE_32
@@ -227,7 +229,7 @@ rijndael_tables:
 ifdef MOZILLA_BSAFE_BUILD
 
 private_export::
-ifeq ($(OS_ARCH), WINNT)
+ifeq (,$(filter-out WIN%,$(OS_TARGET)))
 	rm -f $(DIST)/lib/bsafe$(BSAFEVER).lib
 endif
 	$(NSINSTALL) -R $(BSAFEPATH) $(DIST)/lib
@@ -279,7 +281,7 @@ endif
 
 ifdef FREEBL_EXTENDED_BUILD
 
-PURE32DIR = $(OBJDIR)/$(OS_ARCH)pure32
+PURE32DIR = $(OBJDIR)/$(OS_TARGET)pure32
 ALL_TRASH += $(PURE32DIR)
 
 FILES2LN = \
diff --git a/security/nss/lib/freebl/config.mk b/security/nss/lib/freebl/config.mk
index 77eea20a2..476e7743f 100644
--- a/security/nss/lib/freebl/config.mk
+++ b/security/nss/lib/freebl/config.mk
@@ -36,7 +36,7 @@ ifndef FREEBL_RECURSIVE_BUILD
 # we only do this stuff for some of the 32-bit builds, no 64-bit builds
 ifndef USE_64
 
-ifeq ($(OS_ARCH), HP-UX)
+ifeq ($(OS_TARGET), HP-UX)
   FREEBL_EXTENDED_BUILD = 1
 endif
 
@@ -83,7 +83,7 @@ TARGETS	     = $(SHARED_LIBRARY)
 LIBRARY      =
 PROGRAM      =
 
-#ifeq ($(OS_ARCH), HP-UX)
+#ifeq ($(OS_TARGET), HP-UX)
   EXTRA_LIBS        += \
 	$(DIST)/lib/libsecutil.$(LIB_SUFFIX) \
 	$(NULL)
diff --git a/security/nss/lib/nss/config.mk b/security/nss/lib/nss/config.mk
index 78e041dae..4878c39e6 100644
--- a/security/nss/lib/nss/config.mk
+++ b/security/nss/lib/nss/config.mk
@@ -36,8 +36,8 @@
 #  are specifed as dependencies within rules.mk.
 #
 
-# can't do this in manifest.mn because OS_ARCH isn't defined there.
-ifeq ($(OS_ARCH), WINNT)
+# can't do this in manifest.mn because OS_TARGET isn't defined there.
+ifeq (,$(filter-out WIN%,$(OS_TARGET)))
 
 # don't want the 32 in the shared library name
 SHARED_LIBRARY = $(OBJDIR)/$(LIBRARY_NAME)$(LIBRARY_VERSION).dll
diff --git a/security/nss/lib/pk11wrap/Makefile b/security/nss/lib/pk11wrap/Makefile
index 4810efd29..a84456e7d 100644
--- a/security/nss/lib/pk11wrap/Makefile
+++ b/security/nss/lib/pk11wrap/Makefile
@@ -77,8 +77,7 @@ export:: private_export
 # On AIX 4.3, IBM xlC_r compiler (version 3.6.6) cannot compile
 # pk11slot.c in 64-bit mode for unknown reasons.  A workaround is
 # to compile it with optimizations turned on.  (Bugzilla bug #63815)
-ifeq ($(OS_ARCH),AIX)
-ifeq ($(OS_RELEASE),4.3)
+ifeq ($(OS_TARGET)$(OS_RELEASE),AIX4.3)
 ifeq ($(USE_64),1)
 ifndef BUILD_OPT
 $(OBJDIR)/pk11slot.o: pk11slot.c
@@ -87,4 +86,3 @@ $(OBJDIR)/pk11slot.o: pk11slot.c
 endif
 endif
 endif
-endif
diff --git a/security/nss/lib/pki/config.mk b/security/nss/lib/pki/config.mk
index bace96690..9614977ee 100644
--- a/security/nss/lib/pki/config.mk
+++ b/security/nss/lib/pki/config.mk
@@ -37,18 +37,8 @@ ifdef BUILD_IDG
 DEFINES += -DNSSDEBUG
 endif
 
-#
-#  Override TARGETS variable so that only static libraries
-#  are specifed as dependencies within rules.mk.
-#
-
-#TARGETS        = $(LIBRARY)
-#SHARED_LIBRARY =
-#IMPORT_LIBRARY =
-#PROGRAM        =
-
-# can't do this in manifest.mn because OS_ARCH isn't defined there.
-ifeq ($(OS_ARCH), WINNT)
+# can't do this in manifest.mn because OS_TARGET isn't defined there.
+ifeq (,$(filter-out WIN%,$(OS_TARGET)))
 
 # don't want the 32 in the shared library name
 SHARED_LIBRARY = $(OBJDIR)/$(LIBRARY_NAME)$(LIBRARY_VERSION).dll
@@ -112,7 +102,7 @@ EXTRA_SHARED_LIBS += \
 	$(NULL)
 endif
 
-ifeq ($(OS_ARCH),SunOS)
+ifeq ($(OS_TARGET),SunOS)
 MAPFILE = $(OBJDIR)/nsspkimap.sun
 ALL_TRASH += $(MAPFILE)
 MKSHLIB += -M $(MAPFILE)
@@ -125,25 +115,25 @@ endif
 endif
 endif
 
-ifeq ($(OS_ARCH),AIX)
+ifeq ($(OS_TARGET),AIX)
 MAPFILE = $(OBJDIR)/nsspkimap.aix
 ALL_TRASH += $(MAPFILE)
 EXPORT_RULES = -bexport:$(MAPFILE)
 endif
 
-ifeq ($(OS_ARCH),HP-UX)
+ifeq ($(OS_TARGET),HP-UX)
 MAPFILE = $(OBJDIR)/nsspkimap.hp
 ALL_TRASH += $(MAPFILE)
 MKSHLIB += -c $(MAPFILE)
 endif
 
-ifeq ($(OS_ARCH), OSF1)
+ifeq ($(OS_TARGET), OSF1)
 MAPFILE = $(OBJDIR)/nsspkimap.osf
 ALL_TRASH += $(MAPFILE)
 MKSHLIB += -hidden -input $(MAPFILE)
 endif
 
-ifeq ($(OS_ARCH),Linux)
+ifeq ($(OS_TARGET),Linux)
 MAPFILE = $(OBJDIR)/nsspkimap.linux
 ALL_TRASH += $(MAPFILE)
 MKSHLIB += -Wl,--version-script,$(MAPFILE)
diff --git a/security/nss/lib/smime/config.mk b/security/nss/lib/smime/config.mk
index ed1e8e596..d67ed0b8a 100644
--- a/security/nss/lib/smime/config.mk
+++ b/security/nss/lib/smime/config.mk
@@ -31,19 +31,9 @@
 # GPL.
 #
 
-#
-#  Override TARGETS variable so that only static libraries
-#  are specifed as dependencies within rules.mk.
-#
-
-#TARGETS        = $(LIBRARY)
-#SHARED_LIBRARY =
-#IMPORT_LIBRARY =
-#PROGRAM        =
-
 RELEASE_LIBS = $(TARGETS)
 
-ifeq ($(OS_ARCH), WINNT)
+ifeq (,$(filter-out WIN%,$(OS_TARGET)))
 
 # don't want the 32 in the shared library name
 SHARED_LIBRARY = $(OBJDIR)/$(LIBRARY_NAME)$(LIBRARY_VERSION).dll
diff --git a/security/nss/lib/softoken/Makefile b/security/nss/lib/softoken/Makefile
index 02e3d5079..fa3b20648 100644
--- a/security/nss/lib/softoken/Makefile
+++ b/security/nss/lib/softoken/Makefile
@@ -77,8 +77,7 @@ export:: private_export
 # On AIX 4.3, IBM xlC_r compiler (version 3.6.6) cannot compile
 # pkcs11c.c in 64-bit mode for unknown reasons.  A workaround is
 # to compile it with optimizations turned on.  (Bugzilla bug #63815)
-ifeq ($(OS_ARCH),AIX)
-ifeq ($(OS_RELEASE),4.3)
+ifeq ($(OS_TARGET)$(OS_RELEASE),AIX4.3)
 ifeq ($(USE_64),1)
 ifndef BUILD_OPT
 $(OBJDIR)/pkcs11.o: pkcs11.c
@@ -90,4 +89,3 @@ $(OBJDIR)/pkcs11c.o: pkcs11c.c
 endif
 endif
 endif
-endif
diff --git a/security/nss/lib/softoken/config.mk b/security/nss/lib/softoken/config.mk
index df7e328fc..f280dec2d 100644
--- a/security/nss/lib/softoken/config.mk
+++ b/security/nss/lib/softoken/config.mk
@@ -31,16 +31,6 @@
 # GPL.
 #
 
-#
-#  Override TARGETS variable so that only static libraries
-#  are specifed as dependencies within rules.mk.
-#
-
-#TARGETS        = $(LIBRARY)
-#SHARED_LIBRARY =
-#IMPORT_LIBRARY =
-#PROGRAM        =
-
 
 ifdef MOZILLA_CLIENT
 DEFINES += -DMOZ_CLIENT
@@ -60,8 +50,8 @@ EXTRA_LIBS += \
 	$(DIST)/lib/$(LIB_PREFIX)dbm.$(LIB_SUFFIX) \
 	$(NULL)
 
-# can't do this in manifest.mn because OS_ARCH isn't defined there.
-ifeq ($(OS_ARCH), WINNT)
+# can't do this in manifest.mn because OS_TARGET isn't defined there.
+ifeq (,$(filter-out WIN%,$(OS_TARGET)))
 
 # don't want the 32 in the shared library name
 SHARED_LIBRARY = $(OBJDIR)/$(LIBRARY_NAME)$(LIBRARY_VERSION).dll
@@ -96,7 +86,7 @@ EXTRA_SHARED_LIBS += \
 	$(NULL)
 endif
 
-ifeq ($(OS_ARCH),SunOS)
+ifeq ($(OS_TARGET),SunOS)
 ifndef USE_64
 ifeq ($(CPU_ARCH),sparc)
 # The -R '$ORIGIN' linker option instructs libnss3.so to search for its
diff --git a/security/nss/lib/ssl/Makefile b/security/nss/lib/ssl/Makefile
index fff62966e..9b652250d 100644
--- a/security/nss/lib/ssl/Makefile
+++ b/security/nss/lib/ssl/Makefile
@@ -56,11 +56,11 @@ include $(CORE_DEPTH)/coreconf/config.mk
 
 include config.mk
 
-ifeq ($(OS_ARCH),WINNT)
+ifeq (,$(filter-out WIN%,$(OS_TARGET)))
 CSRCS	+= win32err.c
 DEFINES += -DIN_LIBSSL
 else
-ifeq ($(OS_ARCH),OS2)
+ifeq ($(OS_TARGET),OS2)
 CSRCS	+= os2_err.c
 else
 CSRCS	+= unix_err.c
diff --git a/security/nss/lib/ssl/config.mk b/security/nss/lib/ssl/config.mk
index f26102698..225257d53 100644
--- a/security/nss/lib/ssl/config.mk
+++ b/security/nss/lib/ssl/config.mk
@@ -31,17 +31,7 @@
 # GPL.
 #
 
-#
-#  Override TARGETS variable so that only static libraries
-#  are specifed as dependencies within rules.mk.
-#
-
-#TARGETS        = $(LIBRARY)
-#SHARED_LIBRARY =
-#IMPORT_LIBRARY =
-#PROGRAM        =
-
-ifeq ($(OS_ARCH), WINNT)
+ifeq (,$(filter-out WIN%,$(OS_TARGET)))
 
 # don't want the 32 in the shared library name
 SHARED_LIBRARY = $(OBJDIR)/$(LIBRARY_NAME)$(LIBRARY_VERSION).dll
diff --git a/security/nss/lib/util/Makefile b/security/nss/lib/util/Makefile
index 35c2bfb28..26b783874 100644
--- a/security/nss/lib/util/Makefile
+++ b/security/nss/lib/util/Makefile
@@ -42,14 +42,14 @@ include manifest.mn
 # (2) Include "global" configuration information. (OPTIONAL)          #
 #######################################################################
 
-include $(CORE_DEPTH)/coreconf/arch.mk
+# include $(CORE_DEPTH)/coreconf/arch.mk
 
-ifeq ($(OS_ARCH),HP-UX)
+include $(CORE_DEPTH)/coreconf/config.mk
+
+ifeq ($(OS_TARGET),HP-UX)
 	ASFILES += ret_cr16.s
 endif
 
-include $(CORE_DEPTH)/coreconf/config.mk
-
 #######################################################################
 # (3) Include "component" configuration information. (OPTIONAL)       #
 #######################################################################