提交 a7085940 编写于 作者: B bors

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`.
...@@ -274,6 +274,12 @@ case $CFG_OSTYPE in ...@@ -274,6 +274,12 @@ case $CFG_OSTYPE in
MINGW32*) MINGW32*)
CFG_OSTYPE=pc-mingw32 CFG_OSTYPE=pc-mingw32
;; ;;
MINGW64*)
# msys2, MSYSTEM=MINGW64
CFG_OSTYPE=w64-mingw32
;;
# Thad's Cygwin identifers below # Thad's Cygwin identifers below
# Vista 32 bit # Vista 32 bit
...@@ -407,7 +413,7 @@ valopt mandir "${CFG_PREFIX}/share/man" "install man pages in PATH" ...@@ -407,7 +413,7 @@ valopt mandir "${CFG_PREFIX}/share/man" "install man pages in PATH"
# --libdir is used to configure the installation directory. # --libdir is used to configure the installation directory.
# FIXME: Thise needs to parameterized over target triples. Do it in platform.mk # FIXME: Thise needs to parameterized over target triples. Do it in platform.mk
CFG_LIBDIR_RELATIVE=lib CFG_LIBDIR_RELATIVE=lib
if [ "$CFG_OSTYPE" = "pc-mingw32" ] if [ "$CFG_OSTYPE" = "pc-mingw32" ] || [ "$CFG_OSTYPE" = "w64-mingw32" ]
then then
CFG_LIBDIR_RELATIVE=bin CFG_LIBDIR_RELATIVE=bin
fi fi
...@@ -533,7 +539,7 @@ then ...@@ -533,7 +539,7 @@ then
fi fi
BIN_SUF= BIN_SUF=
if [ $CFG_OSTYPE = "pc-mingw32" ] if [ "$CFG_OSTYPE" = "pc-mingw32" ] || [ "$CFG_OSTYPE" = "w64-mingw32" ]
then then
BIN_SUF=.exe BIN_SUF=.exe
fi fi
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册