diff options
| author | wtc%netscape.com <devnull@localhost> | 2002-03-23 15:06:02 +0000 |
|---|---|---|
| committer | wtc%netscape.com <devnull@localhost> | 2002-03-23 15:06:02 +0000 |
| commit | f085c7e5bba3e4198cade3778a90e4fdcf490581 (patch) | |
| tree | da6a9552c62808cc8d6b91b2d4673fe940d69d48 | |
| parent | a565f8642230b38eb5b1c53c50fad182b04f4b02 (diff) | |
| download | nss-hg-f085c7e5bba3e4198cade3778a90e4fdcf490581.tar.gz | |
Bugzilla bug 128955: support Netscape's uname, MKS's uname, and Cygwin's
uname. Since CPU_ARCH is already defined in arch.mk, removed the redundant
definition in WIN*.mk. Removed the unnecessary internal variable
PROCESSOR. r=cls.
Modified Files: WIN954.0.mk WINNT3.51.mk WINNT4.0.mk WINNT5.0.mk
WINNT5.1.mk arch.mk
| -rw-r--r-- | security/coreconf/WIN954.0.mk | 15 | ||||
| -rw-r--r-- | security/coreconf/WINNT3.51.mk | 14 | ||||
| -rw-r--r-- | security/coreconf/WINNT4.0.mk | 15 | ||||
| -rw-r--r-- | security/coreconf/WINNT5.0.mk | 15 | ||||
| -rw-r--r-- | security/coreconf/WINNT5.1.mk | 15 | ||||
| -rw-r--r-- | security/coreconf/arch.mk | 2 |
6 files changed, 21 insertions, 55 deletions
diff --git a/security/coreconf/WIN954.0.mk b/security/coreconf/WIN954.0.mk index 8b99703fe..24a44c1ff 100644 --- a/security/coreconf/WIN954.0.mk +++ b/security/coreconf/WIN954.0.mk @@ -35,29 +35,22 @@ # Config stuff for WIN95 # # This makefile defines the following variables: -# CPU_ARCH, OS_CFLAGS, and OS_DLLFLAGS. -# PROCESSOR is an internal variable. +# OS_CFLAGS and OS_DLLFLAGS. include $(CORE_DEPTH)/coreconf/WIN32.mk -PROCESSOR := $(shell uname -p) -ifeq ($(PROCESSOR), I386) - CPU_ARCH = x386 +ifeq ($(CPU_ARCH), x386) OS_CFLAGS += -W3 -nologo DEFINES += -D_X86_ else - ifeq ($(PROCESSOR), MIPS) - CPU_ARCH = MIPS + ifeq ($(CPU_ARCH), MIPS) #OS_CFLAGS += -W3 -nologo #DEFINES += -D_MIPS_ OS_CFLAGS += -W3 -nologo else - ifeq ($(PROCESSOR), ALPHA) - CPU_ARCH = ALPHA + ifeq ($(CPU_ARCH), ALPHA) OS_CFLAGS += -W3 -nologo DEFINES += -D_ALPHA_=1 - else - CPU_ARCH = processor_is_undefined endif endif endif diff --git a/security/coreconf/WINNT3.51.mk b/security/coreconf/WINNT3.51.mk index 606e7a3b1..b422b2b56 100644 --- a/security/coreconf/WINNT3.51.mk +++ b/security/coreconf/WINNT3.51.mk @@ -35,26 +35,20 @@ # Config stuff for WINNT 3.51 # # This makefile defines the following variables: -# CPU_ARCH, OS_CFLAGS, and OS_DLLFLAGS. +# OS_CFLAGS and OS_DLLFLAGS. # It has the following internal variables: # OS_PROC_CFLAGS and OS_WIN_CFLAGS. include $(CORE_DEPTH)/coreconf/WIN32.mk -PROCESSOR := $(shell uname -p) -ifeq ($(PROCESSOR), I386) - CPU_ARCH = x386 +ifeq ($(CPU_ARCH), x386) OS_PROC_CFLAGS += -D_X86_ else - ifeq ($(PROCESSOR), MIPS) - CPU_ARCH = MIPS + ifeq ($(CPU_ARCH), MIPS) OS_PROC_CFLAGS += -D_MIPS_ else - ifeq ($(PROCESSOR), ALPHA) - CPU_ARCH = ALPHA + ifeq ($(CPU_ARCH), ALPHA) OS_PROC_CFLAGS += -D_ALPHA_ - else - CPU_ARCH = processor_is_undefined endif endif endif diff --git a/security/coreconf/WINNT4.0.mk b/security/coreconf/WINNT4.0.mk index c760bb4fb..7fc5a54d6 100644 --- a/security/coreconf/WINNT4.0.mk +++ b/security/coreconf/WINNT4.0.mk @@ -35,29 +35,22 @@ # Config stuff for WINNT 4.0 # # This makefile defines the following variables: -# CPU_ARCH, OS_CFLAGS, and OS_DLLFLAGS. -# PROCESSOR is an internal variable. +# OS_CFLAGS and OS_DLLFLAGS. include $(CORE_DEPTH)/coreconf/WIN32.mk -PROCESSOR := $(shell uname -p) -ifeq ($(PROCESSOR), I386) - CPU_ARCH = x386 +ifeq ($(CPU_ARCH), x386) OS_CFLAGS += -W3 -nologo DEFINES += -D_X86_ else - ifeq ($(PROCESSOR), MIPS) - CPU_ARCH = MIPS + ifeq ($(CPU_ARCH), MIPS) #OS_CFLAGS += -W3 -nologo #DEFINES += -D_MIPS_ OS_CFLAGS += -W3 -nologo else - ifeq ($(PROCESSOR), ALPHA) - CPU_ARCH = ALPHA + ifeq ($(CPU_ARCH), ALPHA) OS_CFLAGS += -W3 -nologo DEFINES += -D_ALPHA_=1 - else - CPU_ARCH = processor_is_undefined endif endif endif diff --git a/security/coreconf/WINNT5.0.mk b/security/coreconf/WINNT5.0.mk index 844e7c048..303b98007 100644 --- a/security/coreconf/WINNT5.0.mk +++ b/security/coreconf/WINNT5.0.mk @@ -35,29 +35,22 @@ # Config stuff for WINNT 5.0 (Windows 2000) # # This makefile defines the following variables: -# CPU_ARCH, OS_CFLAGS, and OS_DLLFLAGS. -# PROCESSOR is an internal variable. +# OS_CFLAGS and OS_DLLFLAGS. include $(CORE_DEPTH)/coreconf/WIN32.mk -PROCESSOR := $(shell uname -p) -ifeq ($(PROCESSOR), I386) - CPU_ARCH = x386 +ifeq ($(CPU_ARCH), x386) OS_CFLAGS += -W3 -nologo DEFINES += -D_X86_ else - ifeq ($(PROCESSOR), MIPS) - CPU_ARCH = MIPS + ifeq ($(CPU_ARCH), MIPS) #OS_CFLAGS += -W3 -nologo #DEFINES += -D_MIPS_ OS_CFLAGS += -W3 -nologo else - ifeq ($(PROCESSOR), ALPHA) - CPU_ARCH = ALPHA + ifeq ($(CPU_ARCH), ALPHA) OS_CFLAGS += -W3 -nologo DEFINES += -D_ALPHA_=1 - else - CPU_ARCH = processor_is_undefined endif endif endif diff --git a/security/coreconf/WINNT5.1.mk b/security/coreconf/WINNT5.1.mk index 90b5a546a..f9c7ed1c8 100644 --- a/security/coreconf/WINNT5.1.mk +++ b/security/coreconf/WINNT5.1.mk @@ -35,29 +35,22 @@ # Config stuff for WINNT 5.1 (Windows XP) # # This makefile defines the following variables: -# CPU_ARCH, OS_CFLAGS, and OS_DLLFLAGS. -# PROCESSOR is an internal variable. +# OS_CFLAGS and OS_DLLFLAGS. include $(CORE_DEPTH)/coreconf/WIN32.mk -PROCESSOR := $(shell uname -p) -ifeq ($(PROCESSOR), I386) - CPU_ARCH = x386 +ifeq ($(CPU_ARCH), x386) OS_CFLAGS += -W3 -nologo DEFINES += -D_X86_ else - ifeq ($(PROCESSOR), MIPS) - CPU_ARCH = MIPS + ifeq ($(CPU_ARCH), MIPS) #OS_CFLAGS += -W3 -nologo #DEFINES += -D_MIPS_ OS_CFLAGS += -W3 -nologo else - ifeq ($(PROCESSOR), ALPHA) - CPU_ARCH = ALPHA + ifeq ($(CPU_ARCH), ALPHA) OS_CFLAGS += -W3 -nologo DEFINES += -D_ALPHA_=1 - else - CPU_ARCH = processor_is_undefined endif endif endif diff --git a/security/coreconf/arch.mk b/security/coreconf/arch.mk index b5c4f7d0a..277232c0c 100644 --- a/security/coreconf/arch.mk +++ b/security/coreconf/arch.mk @@ -252,7 +252,7 @@ ifeq (CYGWIN_NT,$(findstring CYGWIN_NT,$(OS_ARCH))) # Cygwin's uname -m returns "i686" on a Pentium Pro machine. # ifneq (,$(findstring 86,$(CPU_ARCH))) - CPU_ARCH = x86 + CPU_ARCH = x386 endif endif endif |