Merge branch 'master' of github.com:aquynh/capstone

muse117 · Dec 20, 2018 · e8967c6 · e8967c6
2 parents bf43394 + 02497b1
commit e8967c6
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/cstool/Makefile b/cstool/Makefile
@@ -19,7 +19,7 @@ IS_CYGWIN := $(shell $(CC) -dumpmachine 2>/dev/null | grep -i cygwin | wc -l)
 ifeq ($(IS_CYGWIN),1)
 LIBCAPSTONE = capstone.lib
 else
-IS_MINGW := $(shell $(CC) --version 2>/dev/null | grep -i mingw | wc -l)
+IS_MINGW := $(shell $(CC) --version 2>/dev/null | grep -i "\(mingw\|MSYS\)" | wc -l)
 ifeq ($(IS_MINGW),1)
 LIBCAPSTONE = capstone.lib
 endif

diff --git a/tests/Makefile b/tests/Makefile
@@ -44,7 +44,7 @@ BIN_EXT = .exe
 AR_EXT = lib
 else
 # mingw?
-IS_MINGW := $(shell $(CC) --version | grep -i mingw | wc -l)
+IS_MINGW := $(shell $(CC) --version 2>/dev/null | grep -i "\(mingw\|MSYS\)" | wc -l)
 ifeq ($(IS_MINGW),1)
 CFLAGS := $(CFLAGS:-fPIC=)
 BIN_EXT = .exe