diff options
| author | Brian Smith <brian@briansmith.org> | 2013-12-13 00:37:12 -0800 |
|---|---|---|
| committer | Brian Smith <brian@briansmith.org> | 2013-12-13 00:37:12 -0800 |
| commit | ca88d76958e2cda1cb962bcd8ecb2bc9c2932640 (patch) | |
| tree | 97b27660504aeb0b95860348f4286df672df4845 | |
| parent | 95421a5001f480cb2f35c4d0cfefa621771db0a9 (diff) | |
| download | nss-hg-ca88d76958e2cda1cb962bcd8ecb2bc9c2932640.tar.gz | |
Bug 947652, Part 1: Make OS_TARGET=WIN95 the default on Windows, r=wtc
| -rw-r--r-- | coreconf/arch.mk | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/coreconf/arch.mk b/coreconf/arch.mk index 964284a2c..782e6c035 100644 --- a/coreconf/arch.mk +++ b/coreconf/arch.mk @@ -146,7 +146,7 @@ endif # uses fibers). # # If OS_TARGET is not specified, it defaults to $(OS_ARCH), i.e., no -# cross-compilation. +# cross-compilation, except on Windows, where it defaults to WIN95. # # @@ -185,7 +185,7 @@ ifeq ($(OS_ARCH), Windows_NT) endif endif # -# If uname -s returns "CYGWIN_NT-4.0", we assume that we are using +# If uname -s returns "CYGWIN_NT-*", we assume that we are using # the uname.exe in the Cygwin tools. # ifeq (CYGWIN_NT,$(findstring CYGWIN_NT,$(OS_ARCH))) @@ -205,7 +205,7 @@ ifeq (CYGWIN_NT,$(findstring CYGWIN_NT,$(OS_ARCH))) endif endif # -# If uname -s returns "MINGW32_NT-5.1", we assume that we are using +# If uname -s returns "MINGW32_NT-*", we assume that we are using # the uname.exe in the MSYS toolkit. # ifeq (MINGW32_NT,$(findstring MINGW32_NT,$(OS_ARCH))) @@ -235,8 +235,12 @@ ifeq ($(OS_TARGET),Android) endif ifndef OS_TARGET +ifeq ($(OS_ARCH), WINNT) + OS_TARGET = WIN95 +else OS_TARGET = $(OS_ARCH) endif +endif ifeq ($(OS_TARGET), WIN95) OS_RELEASE = 4.0 |