Skip to content

Commit

Permalink
feat: make sure for both cygwin and msys cygpath is used
Browse files Browse the repository at this point in the history
  • Loading branch information
zdtsw committed Aug 10, 2022
1 parent 7d2b850 commit c78fe71
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
4 changes: 2 additions & 2 deletions scripts/moveDmp.pl
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
Expand Down Expand Up @@ -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');
Expand Down
2 changes: 1 addition & 1 deletion settings.mk
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit c78fe71

Please sign in to comment.