X-Git-Url: https://git.openssl.org/gitweb/?p=openssl.git;a=blobdiff_plain;f=Configure;h=a2dc83921e1a385523853103ad92cdbc50392a18;hp=367e1683ccb71141a55b063dcf831713c4c3db6b;hb=f3df90b2bb064a10bd4a944fb59fedf2cc29035c;hpb=11e46bd7ae27c982b53b175055fa28d2d1712276 diff --git a/Configure b/Configure index 367e1683cc..a2dc83921e 100755 --- a/Configure +++ b/Configure @@ -928,7 +928,7 @@ foreach (sort (keys %disabled)) my $IsMK1MF=scalar grep /^$target$/,@MK1MF_Builds; -$IsMK1MF=1 if ($target eq "mingw" && $^O ne "cygwin"); +$IsMK1MF=1 if ($target eq "mingw" && $^O ne "cygwin" && !is_msys()); $exe_ext=".exe" if ($target eq "Cygwin" || $target eq "DJGPP" || $target eq "mingw"); $exe_ext=".pm" if ($target =~ /vos/); @@ -1829,3 +1829,11 @@ sub test_sanity print STDERR "No sanity errors detected!\n" if $errorcnt == 0; return $errorcnt; } + +# Attempt to detect MSYS environment + +sub is_msys + { + return 1 if (exists $ENV{"TERM"} && $ENV{"TERM"} eq "msys"); + return 0; + }