diff options
| author | bors <bors@rust-lang.org> | 2015-03-07 21:52:20 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2015-03-07 21:52:20 +0000 |
| commit | 2fc8b1e7c4ca741e59b144c331d69bf189759452 (patch) | |
| tree | d4a293201ebd7ca333936f880c78303dcc7c9b62 | |
| parent | 668c6474081a10768ef143b9984efcab5376bf68 (diff) | |
| parent | 9f28f7249fb04d824a070df1a6329595de1c2fd7 (diff) | |
| download | rust-2fc8b1e7c4ca741e59b144c331d69bf189759452.tar.gz rust-2fc8b1e7c4ca741e59b144c331d69bf189759452.zip | |
Auto merge of #23143 - 5paceToast:cygwin-6.3, r=alexcrichton
Not checking for 32/64 bit, since `uname -s` no longer contains an indicator (and `uname -m` returns correct results)
| -rwxr-xr-x | configure | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/configure b/configure index af500a056f1..d56000b14e2 100755 --- a/configure +++ b/configure @@ -430,6 +430,10 @@ case $CFG_OSTYPE in CFG_CPUTYPE=x86_64 ;; +# Win 8 # uname -s on 64-bit cygwin does not contain WOW64, so simply use uname -m to detect arch (works in my install) + CYGWIN_NT-6.3) + CFG_OSTYPE=pc-windows-gnu + ;; # We do not detect other OS such as XP/2003 using 64 bit using uname. # If we want to in the future, we will need to use Cygwin - Chuck's csih helper in /usr/lib/csih/winProductName.exe or alternative. *) |