diff options
| author | bors <bors@rust-lang.org> | 2014-03-29 13:31:36 -0700 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2014-03-29 13:31:36 -0700 |
| commit | a7085940499748558f4236368a145b03f521843b (patch) | |
| tree | 687696955ccf6ad45419c3634fb13cc3ea70b71d | |
| parent | d878df05ad589d1ae3f4e087bbc8abba1b459703 (diff) | |
| parent | d9d197d9fcb3b796073ce58181c26c81d82147c8 (diff) | |
auto merge of #13199 : klutzy/rust/msys2, r=cmr
MSYS2 supports `MINGW64` system for 64-bit environment. It sets `MSYSTEM=MINGW64` environment variable, which changes output of `uname -s` thus affects `configure` behavior. This patch adds `MINGW64*` support for `configure`.
| -rwxr-xr-x | configure | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/configure b/configure index 402a3c0e0d8..90966bd57b4 100755 --- a/configure +++ b/configure @@ -274,6 +274,12 @@ case $CFG_OSTYPE in MINGW32*) CFG_OSTYPE=pc-mingw32 ;; + + MINGW64*) + # msys2, MSYSTEM=MINGW64 + CFG_OSTYPE=w64-mingw32 + ;; + # Thad's Cygwin identifers below # Vista 32 bit @@ -407,7 +413,7 @@ valopt mandir "${CFG_PREFIX}/share/man" "install man pages in PATH" # --libdir is used to configure the installation directory. # FIXME: Thise needs to parameterized over target triples. Do it in platform.mk CFG_LIBDIR_RELATIVE=lib -if [ "$CFG_OSTYPE" = "pc-mingw32" ] +if [ "$CFG_OSTYPE" = "pc-mingw32" ] || [ "$CFG_OSTYPE" = "w64-mingw32" ] then CFG_LIBDIR_RELATIVE=bin fi @@ -533,7 +539,7 @@ then fi BIN_SUF= -if [ $CFG_OSTYPE = "pc-mingw32" ] +if [ "$CFG_OSTYPE" = "pc-mingw32" ] || [ "$CFG_OSTYPE" = "w64-mingw32" ] then BIN_SUF=.exe fi |