Skip to content

Commit 3bd313c

Browse files
Alexpuxlazka
Alexpux
authored and
lazka
committed
Add MSYS2 triplet
1 parent 2644508 commit 3bd313c

16 files changed

+93
-81
lines changed

Diff for: ‎compile

+2-2
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ func_file_conv ()
5353
MINGW*)
5454
file_conv=mingw
5555
;;
56-
CYGWIN*)
56+
CYGWIN*|MSYS*)
5757
file_conv=cygwin
5858
;;
5959
*)
@@ -67,7 +67,7 @@ func_file_conv ()
6767
mingw/*)
6868
file=`cmd //C echo "$file " | sed -e 's/"\(.*\) " *$/\1/'`
6969
;;
70-
cygwin/*)
70+
cygwin/*|msys/*)
7171
file=`cygpath -m "$file" || echo "$file"`
7272
;;
7373
wine/*)

Diff for: ‎config.guess

+3
Original file line numberDiff line numberDiff line change
@@ -914,6 +914,9 @@ EOF
914914
amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*)
915915
echo x86_64-pc-cygwin
916916
exit ;;
917+
amd64:MSYS*:*:* | x86_64:MSYS*:*:*)
918+
echo x86_64-unknown-msys
919+
exit ;;
917920
prep*:SunOS:5.*:*)
918921
echo powerpcle-unknown-solaris2"$(echo "$UNAME_RELEASE"|sed -e 's/[^.]*//')"
919922
exit ;;

Diff for: ‎config.rpath

+4-4
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ hardcode_direct=no
109109
hardcode_minus_L=no
110110

111111
case "$host_os" in
112-
cygwin* | mingw* | pw32*)
112+
cygwin* | msys* | mingw* | pw32*)
113113
# FIXME: the MSVC++ port hasn't been tested in a loooong time
114114
# When not using gcc, we currently assume that we are using
115115
# Microsoft Visual C++.
@@ -149,7 +149,7 @@ if test "$with_gnu_ld" = yes; then
149149
ld_shlibs=no
150150
fi
151151
;;
152-
cygwin* | mingw* | pw32*)
152+
cygwin* | msys* | mingw* | pw32*)
153153
# hardcode_libdir_flag_spec is actually meaningless, as there is
154154
# no search path for DLLs.
155155
hardcode_libdir_flag_spec='-L$libdir'
@@ -268,7 +268,7 @@ else
268268
;;
269269
bsdi4*)
270270
;;
271-
cygwin* | mingw* | pw32*)
271+
cygwin* | msys* | mingw* | pw32*)
272272
# When not using gcc, we currently assume that we are using
273273
# Microsoft Visual C++.
274274
# hardcode_libdir_flag_spec is actually meaningless, as there is
@@ -437,7 +437,7 @@ case "$host_os" in
437437
;;
438438
bsdi4*)
439439
;;
440-
cygwin* | mingw* | pw32*)
440+
cygwin* | msys* | mingw* | pw32*)
441441
shrext=.dll
442442
;;
443443
darwin* | rhapsody*)

Diff for: ‎config/dfp.m4

+2-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,8 @@ Valid choices are 'yes', 'bid', 'dpd', and 'no'.]) ;;
2323
powerpc*-*-linux* | i?86*-*-linux* | x86_64*-*-linux* | s390*-*-linux* | \
2424
i?86*-*-elfiamcu | i?86*-*-gnu* | \
2525
i?86*-*-mingw* | x86_64*-*-mingw* | \
26-
i?86*-*-cygwin* | x86_64*-*-cygwin*)
26+
i?86*-*-cygwin* | x86_64*-*-cygwin* | \
27+
i?86*-*-msys* | x86_64*-*-msys*)
2728
enable_decimal_float=yes
2829
;;
2930
*)

Diff for: ‎config/elf.m4

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ AC_REQUIRE([AC_CANONICAL_TARGET])
1515
1616
target_elf=no
1717
case $target in
18-
*-darwin* | *-aix* | *-cygwin* | *-mingw* | *-aout* | *-*coff* | \
18+
*-darwin* | *-aix* | *-cygwin* | *-msys* | *-mingw* | *-aout* | *-*coff* | \
1919
*-msdosdjgpp* | *-vms* | *-wince* | *-*-pe* | \
2020
alpha*-dec-osf* | hppa[[12]]*-*-hpux* | \
2121
nvptx-*-none)

Diff for: ‎config/lthostflags.m4

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ AC_DEFUN([ACX_LT_HOST_FLAGS], [
1313
AC_REQUIRE([AC_CANONICAL_SYSTEM])
1414
1515
case $host in
16-
*-cygwin* | *-mingw*)
16+
*-cygwin* | *-msys* | *-mingw*)
1717
# 'host' will be top-level target in the case of a target lib,
1818
# we must compare to with_cross_host to decide if this is a native
1919
# or cross-compiler and select where to install dlls appropriately.

Diff for: ‎config/mmap.m4

+2-2
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ else
4242
# Systems known to be in this category are Windows (all variants),
4343
# VMS, and Darwin.
4444
case "$host_os" in
45-
*vms* | cygwin* | pe | mingw* | darwin* | ultrix* | hpux10* | hpux11.00)
45+
*vms* | cygwin* | msys* | pe | mingw* | darwin* | ultrix* | hpux10* | hpux11.00)
4646
gcc_cv_func_mmap_dev_zero=no ;;
4747
*)
4848
gcc_cv_func_mmap_dev_zero=yes;;
@@ -74,7 +74,7 @@ else
7474
# above for use of /dev/zero.
7575
# Systems known to be in this category are Windows, VMS, and SCO Unix.
7676
case "$host_os" in
77-
*vms* | cygwin* | pe | mingw* | sco* | udk* )
77+
*vms* | cygwin* | msys* | pe | mingw* | sco* | udk* )
7878
gcc_cv_func_mmap_anon=no ;;
7979
*)
8080
gcc_cv_func_mmap_anon=yes;;

Diff for: ‎config/picflag.m4

+2
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,8 @@ case "${$2}" in
2525
;;
2626
i[[34567]]86-*-cygwin* | x86_64-*-cygwin*)
2727
;;
28+
i[[34567]]86-*-msys* | x86_64-*-msys*)
29+
;;
2830
i[[34567]]86-*-mingw* | x86_64-*-mingw*)
2931
;;
3032
i[[34567]]86-*-nto-qnx*)

Diff for: ‎config/tcl.m4

+2-2
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ AC_DEFUN([SC_PATH_TCLCONFIG], [
3333
3434
# First check to see if --with-tcl was specified.
3535
case "${host}" in
36-
*-*-cygwin*) platDir="win" ;;
36+
*-*-cygwin* | *-*-msys*) platDir="win" ;;
3737
*) platDir="unix" ;;
3838
esac
3939
if test x"${with_tclconfig}" != x ; then
@@ -165,7 +165,7 @@ AC_DEFUN([SC_PATH_TKCONFIG], [
165165
166166
# then check for a private Tk library
167167
case "${host}" in
168-
*-*-cygwin*) platDir="win" ;;
168+
*-*-cygwin* | *-*-msys*) platDir="win" ;;
169169
*) platDir="unix" ;;
170170
esac
171171
if test x"${ac_cv_c_tkconfig}" = x ; then

Diff for: ‎configure

+11-11
Original file line numberDiff line numberDiff line change
@@ -3088,7 +3088,7 @@ fi
30883088
# Configure extra directories which are host specific
30893089

30903090
case "${host}" in
3091-
*-cygwin*)
3091+
*-cygwin* | *-msys*)
30923092
configdirs="$configdirs libtermcap" ;;
30933093
esac
30943094

@@ -3609,7 +3609,7 @@ esac
36093609
# Disable the go frontend on systems where it is known to not work. Please keep
36103610
# this in sync with contrib/config-list.mk.
36113611
case "${target}" in
3612-
*-*-darwin* | *-*-cygwin* | *-*-mingw* | *-*-aix*)
3612+
*-*-darwin* | *-*-cygwin* | *-*-msys* | *-*-mingw* | *-*-aix*)
36133613
unsupported_languages="$unsupported_languages go"
36143614
;;
36153615
esac
@@ -3622,7 +3622,7 @@ if test x$enable_libgo = x; then
36223622
# PR 46986
36233623
noconfigdirs="$noconfigdirs target-libgo"
36243624
;;
3625-
*-*-cygwin* | *-*-mingw*)
3625+
*-*-cygwin* | *-*-msys* | *-*-mingw*)
36263626
noconfigdirs="$noconfigdirs target-libgo"
36273627
;;
36283628
*-*-aix*)
@@ -3894,7 +3894,7 @@ case "${target}" in
38943894
i[3456789]86-*-mingw*)
38953895
target_configdirs="$target_configdirs target-winsup"
38963896
;;
3897-
*-*-cygwin*)
3897+
*-*-cygwin* | *-*-msys*)
38983898
target_configdirs="$target_configdirs target-libtermcap target-winsup"
38993899
noconfigdirs="$noconfigdirs target-libgloss"
39003900
# always build newlib if winsup directory is present.
@@ -4038,7 +4038,7 @@ case "${host}" in
40384038
i[3456789]86-*-msdosdjgpp*)
40394039
host_makefile_frag="config/mh-djgpp"
40404040
;;
4041-
*-cygwin*)
4041+
*-cygwin* | *-msys*)
40424042

40434043
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking to see if cat works as expected" >&5
40444044
$as_echo_n "checking to see if cat works as expected... " >&6; }
@@ -6206,7 +6206,7 @@ fi
62066206

62076207
target_elf=no
62086208
case $target in
6209-
*-darwin* | *-aix* | *-cygwin* | *-mingw* | *-aout* | *-*coff* | \
6209+
*-darwin* | *-aix* | *-cygwin* | *-msys* | *-mingw* | *-aout* | *-*coff* | \
62106210
*-msdosdjgpp* | *-vms* | *-wince* | *-*-pe* | \
62116211
alpha*-dec-osf* | hppa[12]*-*-hpux* | \
62126212
nvptx-*-none)
@@ -6224,7 +6224,7 @@ if test $target_elf = yes; then :
62246224
else
62256225
if test x"$default_enable_lto" = x"yes" ; then
62266226
case $target in
6227-
*-apple-darwin9* | *-cygwin* | *-mingw* | *djgpp*) ;;
6227+
*-apple-darwin9* | *-cygwin* | *-msys* | *-mingw* | *djgpp*) ;;
62286228
# On other non-ELF platforms, LTO has yet to be validated.
62296229
*) enable_lto=no ;;
62306230
esac
@@ -6235,7 +6235,7 @@ else
62356235
# warn during gcc/ subconfigure; unless you're bootstrapping with
62366236
# -flto it won't be needed until after installation anyway.
62376237
case $target in
6238-
*-cygwin* | *-mingw* | *-apple-darwin* | *djgpp*) ;;
6238+
*-cygwin* | *-msys* | *-mingw* | *-apple-darwin* | *djgpp*) ;;
62396239
*) if test x"$enable_lto" = x"yes"; then
62406240
as_fn_error $? "LTO support is not enabled for this target." "$LINENO" 5
62416241
fi
@@ -6245,7 +6245,7 @@ else
62456245
# Among non-ELF, only Windows platforms support the lto-plugin so far.
62466246
# Build it unless LTO was explicitly disabled.
62476247
case $target in
6248-
*-cygwin* | *-mingw*) build_lto_plugin=$enable_lto ;;
6248+
*-cygwin* | *-msys* | *-mingw*) build_lto_plugin=$enable_lto ;;
62496249
*) ;;
62506250
esac
62516251

@@ -7130,7 +7130,7 @@ rm -f conftest*
71307130
case "${host}" in
71317131
*-*-hpux*) RPATH_ENVVAR=SHLIB_PATH ;;
71327132
*-*-darwin*) RPATH_ENVVAR=DYLD_LIBRARY_PATH ;;
7133-
*-*-mingw* | *-*-cygwin ) RPATH_ENVVAR=PATH ;;
7133+
*-*-mingw* | *-*-cygwin | *-msys ) RPATH_ENVVAR=PATH ;;
71347134
*) RPATH_ENVVAR=LD_LIBRARY_PATH ;;
71357135
esac
71367136

@@ -7648,7 +7648,7 @@ case " $target_configdirs " in
76487648
case " $target_configargs " in
76497649
*" --with-newlib "*)
76507650
case "$target" in
7651-
*-cygwin*)
7651+
*-cygwin* | *-msys*)
76527652
FLAGS_FOR_TARGET=$FLAGS_FOR_TARGET' -L$$r/$(TARGET_SUBDIR)/winsup/cygwin -isystem $$s/winsup/cygwin/include'
76537653
;;
76547654
esac

Diff for: ‎configure.ac

+10-10
Original file line numberDiff line numberDiff line change
@@ -409,7 +409,7 @@ AC_ARG_ENABLE(compressed_debug_sections,
409409
# Configure extra directories which are host specific
410410

411411
case "${host}" in
412-
*-cygwin*)
412+
*-cygwin* | *-msys*)
413413
configdirs="$configdirs libtermcap" ;;
414414
esac
415415

@@ -893,7 +893,7 @@ esac
893893
# Disable the go frontend on systems where it is known to not work. Please keep
894894
# this in sync with contrib/config-list.mk.
895895
case "${target}" in
896-
*-*-darwin* | *-*-cygwin* | *-*-mingw* | *-*-aix*)
896+
*-*-darwin* | *-*-cygwin* | *-*-msys* | *-*-mingw* | *-*-aix*)
897897
unsupported_languages="$unsupported_languages go"
898898
;;
899899
esac
@@ -906,7 +906,7 @@ if test x$enable_libgo = x; then
906906
# PR 46986
907907
noconfigdirs="$noconfigdirs target-libgo"
908908
;;
909-
*-*-cygwin* | *-*-mingw*)
909+
*-*-cygwin* | *-*-msys* | *-*-mingw*)
910910
noconfigdirs="$noconfigdirs target-libgo"
911911
;;
912912
*-*-aix*)
@@ -1178,7 +1178,7 @@ case "${target}" in
11781178
i[[3456789]]86-*-mingw*)
11791179
target_configdirs="$target_configdirs target-winsup"
11801180
;;
1181-
*-*-cygwin*)
1181+
*-*-cygwin* | *-*-msys*)
11821182
target_configdirs="$target_configdirs target-libtermcap target-winsup"
11831183
noconfigdirs="$noconfigdirs target-libgloss"
11841184
# always build newlib if winsup directory is present.
@@ -1322,7 +1322,7 @@ case "${host}" in
13221322
i[[3456789]]86-*-msdosdjgpp*)
13231323
host_makefile_frag="config/mh-djgpp"
13241324
;;
1325-
*-cygwin*)
1325+
*-cygwin* | *-msys*)
13261326
ACX_CHECK_CYGWIN_CAT_WORKS
13271327
host_makefile_frag="config/mh-cygwin"
13281328
;;
@@ -1809,7 +1809,7 @@ ACX_ELF_TARGET_IFELSE([# ELF platforms build the lto-plugin always.
18091809
build_lto_plugin=yes
18101810
],[if test x"$default_enable_lto" = x"yes" ; then
18111811
case $target in
1812-
*-apple-darwin9* | *-cygwin* | *-mingw* | *djgpp*) ;;
1812+
*-apple-darwin9* | *-cygwin* | *-msys* | *-mingw* | *djgpp*) ;;
18131813
# On other non-ELF platforms, LTO has yet to be validated.
18141814
*) enable_lto=no ;;
18151815
esac
@@ -1820,7 +1820,7 @@ ACX_ELF_TARGET_IFELSE([# ELF platforms build the lto-plugin always.
18201820
# warn during gcc/ subconfigure; unless you're bootstrapping with
18211821
# -flto it won't be needed until after installation anyway.
18221822
case $target in
1823-
*-cygwin* | *-mingw* | *-apple-darwin* | *djgpp*) ;;
1823+
*-cygwin* | *-msys*| *-mingw* | *-apple-darwin* | *djgpp*) ;;
18241824
*) if test x"$enable_lto" = x"yes"; then
18251825
AC_MSG_ERROR([LTO support is not enabled for this target.])
18261826
fi
@@ -1830,7 +1830,7 @@ ACX_ELF_TARGET_IFELSE([# ELF platforms build the lto-plugin always.
18301830
# Among non-ELF, only Windows platforms support the lto-plugin so far.
18311831
# Build it unless LTO was explicitly disabled.
18321832
case $target in
1833-
*-cygwin* | *-mingw*) build_lto_plugin=$enable_lto ;;
1833+
*-cygwin* | *-msys* | *-mingw*) build_lto_plugin=$enable_lto ;;
18341834
*) ;;
18351835
esac
18361836
])
@@ -2652,7 +2652,7 @@ rm -f conftest*
26522652
case "${host}" in
26532653
*-*-hpux*) RPATH_ENVVAR=SHLIB_PATH ;;
26542654
*-*-darwin*) RPATH_ENVVAR=DYLD_LIBRARY_PATH ;;
2655-
*-*-mingw* | *-*-cygwin ) RPATH_ENVVAR=PATH ;;
2655+
*-*-mingw* | *-*-cygwin | *-*-msys ) RPATH_ENVVAR=PATH ;;
26562656
*) RPATH_ENVVAR=LD_LIBRARY_PATH ;;
26572657
esac
26582658

@@ -3165,7 +3165,7 @@ case " $target_configdirs " in
31653165
case " $target_configargs " in
31663166
*" --with-newlib "*)
31673167
case "$target" in
3168-
*-cygwin*)
3168+
*-cygwin* | *-msys*)
31693169
FLAGS_FOR_TARGET=$FLAGS_FOR_TARGET' -L$$r/$(TARGET_SUBDIR)/winsup/cygwin -isystem $$s/winsup/cygwin/include'
31703170
;;
31713171
esac

0 commit comments

Comments
 (0)