From c8abfffc216b9b897d25675fb920e51bdbfd3562 Mon Sep 17 00:00:00 2001 From: Egor Tensin Date: Fri, 8 Jan 2021 16:55:37 +0300 Subject: Cygwin: add mingw/bin to PATH --- action.yml | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'action.yml') 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 -- cgit v1.2.3