aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorEgor Tensin <Egor.Tensin@gmail.com>2021-01-08 16:55:37 +0300
committerEgor Tensin <Egor.Tensin@gmail.com>2021-01-08 16:55:37 +0300
commitc8abfffc216b9b897d25675fb920e51bdbfd3562 (patch)
tree2ad63f4b62d7d738643ebb0716a9f40026ff99b7
parentworkflows/test.yml: test Cygwin also (diff)
downloadsetup-mingw-c8abfffc216b9b897d25675fb920e51bdbfd3562.tar.gz
setup-mingw-c8abfffc216b9b897d25675fb920e51bdbfd3562.zip
Cygwin: add mingw/bin to PATH
Diffstat (limited to '')
-rw-r--r--action.yml10
1 files changed, 7 insertions, 3 deletions
diff --git a/action.yml b/action.yml
index 0e7253f..b80d49c 100644
--- a/action.yml
+++ b/action.yml
@@ -119,10 +119,14 @@ runs:
$pkg = if ($x64) { 'mingw64-x86_64-gcc-g++' } else { 'mingw64-i686-gcc-g++' }
Install-Package $pkg
+ $bin_dir = cygpath.exe -wa "/usr/$prefix/sys-root/mingw/bin"
+ $lib_dir = cygpath.exe -wa "/usr/$prefix/sys-root/mingw/lib"
+
+ echo $bin_dir >> $env:GITHUB_PATH
+
if ($static_workaround) {
- $cygwin_lib = Join-Path C: tools cygwin usr $prefix sys-root mingw lib
- Remove-Item (Join-Path $cygwin_lib 'libpthread.dll.a')
- Remove-Item (Join-Path $cygwin_lib 'libwinpthread.dll.a')
+ Remove-Item (Join-Path $lib_dir 'libpthread.dll.a')
+ Remove-Item (Join-Path $lib_dir 'libwinpthread.dll.a')
}
} elseif ($windows_host) {
$choco = Locate-Choco