Skip to content

Commit

Permalink
configure: Add MINGW64 OS type
Browse files Browse the repository at this point in the history
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`.
  • Loading branch information
klutzy committed Mar 29, 2014
1 parent 3eb3a02 commit d9d197d
Showing 1 changed file with 8 additions and 2 deletions.
10 changes: 8 additions & 2 deletions configure
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down

5 comments on commit d9d197d

@bors
Copy link
Contributor

@bors bors commented on d9d197d Mar 29, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

saw approval from cmr
at klutzy@d9d197d

@bors
Copy link
Contributor

@bors bors commented on d9d197d Mar 29, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

merging klutzy/rust/msys2 = d9d197d into auto

@bors
Copy link
Contributor

@bors bors commented on d9d197d Mar 29, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

klutzy/rust/msys2 = d9d197d merged ok, testing candidate = a708594

@bors
Copy link
Contributor

@bors bors commented on d9d197d Mar 29, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@bors
Copy link
Contributor

@bors bors commented on d9d197d Mar 29, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

fast-forwarding master to auto = a708594

Please sign in to comment.