diff options
| author | Jay Berkenbilt <ejb@ql.org> | 2022-03-08 15:26:40 +0100 |
|---|---|---|
| committer | Jay Berkenbilt <ejb@ql.org> | 2022-03-08 18:32:06 +0100 |
| commit | 09a36ad62bfa787642778b8076ae5b4ba4a64fcc (patch) | |
| tree | 5d9984bce31784cb83305ab20361e2dc9a20793a /build-scripts/build-windows | |
| parent | 6b114684c2414d224de4bc49c4849ab641491bf4 (diff) | |
| download | qpdf-10.6.tar.zst | |
Run Windows build on Windows 2022 runnerrelease-qpdf-10.6.310.6
Diffstat (limited to 'build-scripts/build-windows')
| -rwxr-xr-x | build-scripts/build-windows | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/build-scripts/build-windows b/build-scripts/build-windows index 81543668..e08b653e 100755 --- a/build-scripts/build-windows +++ b/build-scripts/build-windows @@ -6,16 +6,14 @@ tool=$2 if [[ $tool == mingw ]]; then pacman -Sy --noconfirm make base-devel tar zip unzip - if [ -d /c/msys64 ]; then - PATH="/c/msys64/mingw$wordsize/bin:$PATH" - else + if [ ! -x /c/msys64/mingw$wordsize/bin/g++.exe ]; then if [[ $wordsize == 64 ]]; then pacman -Sy --noconfirm mingw-w64-x86_64-toolchain else pacman -Sy --noconfirm mingw-w64-i686-toolchain fi - PATH="/c/tools/msys64/mingw$wordsize/bin:$PATH" fi + PATH="/c/msys64/mingw$wordsize/bin:$PATH" g++ -v elif [[ $tool == msvc ]]; then cl |