Skip to content

Commit a708594

Browse files
committed
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`.
2 parents d878df0 + d9d197d commit a708594

File tree

1 file changed

+8
-2
lines changed

1 file changed

+8
-2
lines changed

configure

+8-2
Original file line numberDiff line numberDiff line change
@@ -274,6 +274,12 @@ case $CFG_OSTYPE in
274274
MINGW32*)
275275
CFG_OSTYPE=pc-mingw32
276276
;;
277+
278+
MINGW64*)
279+
# msys2, MSYSTEM=MINGW64
280+
CFG_OSTYPE=w64-mingw32
281+
;;
282+
277283
# Thad's Cygwin identifers below
278284

279285
# Vista 32 bit
@@ -407,7 +413,7 @@ valopt mandir "${CFG_PREFIX}/share/man" "install man pages in PATH"
407413
# --libdir is used to configure the installation directory.
408414
# FIXME: Thise needs to parameterized over target triples. Do it in platform.mk
409415
CFG_LIBDIR_RELATIVE=lib
410-
if [ "$CFG_OSTYPE" = "pc-mingw32" ]
416+
if [ "$CFG_OSTYPE" = "pc-mingw32" ] || [ "$CFG_OSTYPE" = "w64-mingw32" ]
411417
then
412418
CFG_LIBDIR_RELATIVE=bin
413419
fi
@@ -533,7 +539,7 @@ then
533539
fi
534540

535541
BIN_SUF=
536-
if [ $CFG_OSTYPE = "pc-mingw32" ]
542+
if [ "$CFG_OSTYPE" = "pc-mingw32" ] || [ "$CFG_OSTYPE" = "w64-mingw32" ]
537543
then
538544
BIN_SUF=.exe
539545
fi

0 commit comments

Comments
 (0)