diff options
| author | wtc%netscape.com <devnull@localhost> | 1999-05-17 21:31:16 +0000 |
|---|---|---|
| committer | wtc%netscape.com <devnull@localhost> | 1999-05-17 21:31:16 +0000 |
| commit | f621212d8b10217ee4e8fad51477c3dbeef3a8b8 (patch) | |
| tree | c5e6d5c9ef301598c4aad7c709cb1c1a3a6aca7c | |
| parent | d2ce4ea949182d8cb38a493f1998c35c38416d10 (diff) | |
| download | nspr-hg-f621212d8b10217ee4e8fad51477c3dbeef3a8b8.tar.gz | |
Bugzilla bug #1816: handle the output of the 'uname' command in
the latest Cygwin release (Beta 20). Thanks to Tague Griffith
<tague@netscape.com> for reporting the bug and zuperdee@penguinpowered.com
for pointing out where the bug was.
| -rw-r--r-- | config/arch.mk | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/config/arch.mk b/config/arch.mk index ee56c9c7..4cb48319 100644 --- a/config/arch.mk +++ b/config/arch.mk @@ -198,6 +198,22 @@ ifeq ($(OS_ARCH), Windows_NT) endif else # +# If uname -s returns "CYGWIN_NT-4.0", we assume that we are using +# the uname.exe in the Cygwin tools. +# +ifeq (CYGWIN_NT,$(findstring CYGWIN_NT,$(OS_ARCH))) + OS_RELEASE := $(patsubst CYGWIN_NT-%,%,$(OS_ARCH)) + OS_ARCH = WINNT + CPU_ARCH := $(shell uname -m) + # + # Cygwin's uname -m returns "i686" on a Pentium Pro machine. + # + ifneq (,$(findstring 86,$(CPU_ARCH))) + CPU_ARCH = x86 + endif +else +# +# Prior to the Beta 20 release, Cygwin was called GNU-Win32. # If uname -s returns "CYGWIN32/NT", we assume that we are using # the uname.exe in the GNU-Win32 tools. # @@ -213,6 +229,7 @@ ifeq ($(OS_ARCH), CYGWIN32_NT) endif endif endif +endif ifndef OS_TARGET OS_TARGET := $(OS_ARCH) |