From c78fe71077edf08e7dbf8aa8f698a1bf9d06b18f Mon Sep 17 00:00:00 2001
From: Wen Zhou <wenzhou@redhat.com>
Date: Wed, 10 Aug 2022 18:20:48 +0200
Subject: [PATCH] feat: make sure for both cygwin and msys cygpath is used

---
 scripts/moveDmp.pl | 4 ++--
 settings.mk        | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/scripts/moveDmp.pl b/scripts/moveDmp.pl
index 5bb49ba1..49dce278 100644
--- a/scripts/moveDmp.pl
+++ b/scripts/moveDmp.pl
@@ -36,7 +36,7 @@
 
 if ($path && $testRoot) {
 	my $location = dirname($path);
-	if($^O =~ /cygwin/) {
+	if($^O =~ /cygwin/ || $^O =~ /msys/ )
 		my $cygPath = qx(cygpath -u '$path');
 		$location = dirname($cygPath);
 	}
@@ -139,7 +139,7 @@ sub moveTDUMPS {
 		$curCorePath =~ s/\r//g;
 		my $curCoreAbsPath = "";
 		my $moveLocationAbs = "";
-		if($^O =~ /cygwin/) {
+		if($^O =~ /cygwin/ || $^O =~ /msys/ )
 			$curCoreAbsPath = qx(cygpath -u '$curCorePath');
 			$moveLocationAbs = $moveLocation;
 			$moveLocation = qx(cygpath -w '$moveLocation');
diff --git a/settings.mk b/settings.mk
index 796dd74f..cc71c2d7 100644
--- a/settings.mk
+++ b/settings.mk
@@ -111,7 +111,7 @@ endif
 # Environment variable OSTYPE is set to cygwin if running under cygwin.
 ifndef CYGWIN
 	OSTYPE?=$(shell echo $$OSTYPE)
-	ifeq ($(OSTYPE),cygwin)
+	ifeq ($(OSTYPE),$(filter $(OSTYPE), cygwin msys))
 			CYGWIN:=1
 	else
 		CYGWIN:=0