[commit: nofib] master: Recognize shells reporting as MINGW under windows. (1364fe6)

[git at git.haskell.org]

Repository : ssh://git@git.haskell.org/nofib

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/1364fe623f9216108a285a8804a27bdd8dfea3c4/nofib

>---------------------------------------------------------------

commit 1364fe623f9216108a285a8804a27bdd8dfea3c4
Author: klebinger.andreas at gmx.at <klebinger.andreas at gmx.at>
Date:   Thu Feb 8 00:09:55 2018 +0000

    Recognize shells reporting as MINGW under windows.
    
    Summary:
    My msys instance at least reports MINGW instead of MSYS for uname.
    This commit adjusts the regex to match either one.
    
    Without this some errors occur because of missing .exe extensions in
    file names.
    
    This fixes #14654
    
    Test Plan: make
    
    Reviewers: O26 nofib, Phyx, bgamari
    
    Reviewed By: Phyx, bgamari
    
    Subscribers: bgamari, Phyx
    
    GHC Trac Issues: #14654
    
    Differential Revision: https://phabricator.haskell.org/D4297


>---------------------------------------------------------------

1364fe623f9216108a285a8804a27bdd8dfea3c4
 mk/boilerplate.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mk/boilerplate.mk b/mk/boilerplate.mk
index c2a5cd6..fa8b635 100644
--- a/mk/boilerplate.mk
+++ b/mk/boilerplate.mk
@@ -23,7 +23,7 @@ CONTEXT_DIFF_RAW = diff -U 1
 EXECUTABLE_FILE = chmod +x
 
 # Windows MSYS specific settings
-ifeq ($(shell uname -s | grep -c MSYS), 1)
+ifeq ($(shell uname -s | grep -c 'MSYS\|MINGW'), 1)
 	exeext=.exe
 	CONTEXT_DIFF=$(CONTEXT_DIFF_RAW) --strip-trailing-cr
 else