diff options
| author | Jay Satiro <raysatiro@yahoo.com> | 2022-10-02 17:21:28 -0400 |
|---|---|---|
| committer | Jay Satiro <raysatiro@yahoo.com> | 2022-10-05 03:45:40 -0400 |
| commit | 258ee7372ff801f1e8b31844fc92083bb7ee4e29 (patch) | |
| tree | 57b0281ae0f2326399f46679610aa6eb5d94011b /.cirrus.yml | |
| parent | 4d7372415d56c13a5cfc66d14a3b34c055cdd90f (diff) | |
| download | curl-258ee7372ff801f1e8b31844fc92083bb7ee4e29.tar.gz | |
cirrus: use make LDFLAGS=-all-static instead of curl_LDFLAGS
- Correct the use of -all-static for static Windows CI builds.
curl_LDFLAGS was removed from the makefile when metalink support was
removed. LDFLAGS=-all-static is passed to make only, because it is not a
valid option for configure compilation tests.
Closes https://github.com/curl/curl/pull/9633
Diffstat (limited to '.cirrus.yml')
| -rw-r--r-- | .cirrus.yml | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/.cirrus.yml b/.cirrus.yml index ebd95d8d5..59dc45c85 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -90,6 +90,7 @@ windows_task: prepare: pacman -S --needed --noconfirm --noprogressbar libssh2-devel mingw-w64-i686-libssh2 mingw-w64-i686-python-pip mingw-w64-i686-python-wheel mingw-w64-i686-python-pyopenssl && python3 -m pip install --prefer-binary impacket configure: --host=i686-w64-mingw32 --build=i686-w64-mingw32 --prefix=/mingw32 --enable-werror --enable-sspi --with-schannel --with-winidn --with-libssh2 tests: "~571" + make_cmd: make V=1 - name: Windows 32-bit static/release Schannel/SSPI/WinIDN/libssh2 env: container_img: ghcr.io/mback2k/curl-docker-winbuildenv/msys2-mingw32:ltsc2019 @@ -97,7 +98,7 @@ windows_task: prepare: pacman -S --needed --noconfirm --noprogressbar libssh2-devel mingw-w64-i686-libssh2 mingw-w64-i686-python-pip mingw-w64-i686-python-wheel mingw-w64-i686-python-pyopenssl && python3 -m pip install --prefer-binary impacket configure: --host=i686-w64-mingw32 --build=i686-w64-mingw32 --prefix=/mingw32 --enable-werror --enable-sspi --with-schannel --with-winidn --with-libssh2 --disable-shared --enable-static --enable-websockets tests: "~571" - curl_LDFLAGS: -all-static + make_cmd: make LDFLAGS=-all-static V=1 PKG_CONFIG: pkg-config --static - name: Windows 64-bit shared/release Schannel/SSPI/WinIDN/libssh2 env: @@ -106,6 +107,7 @@ windows_task: prepare: pacman -S --needed --noconfirm --noprogressbar libssh2-devel mingw-w64-x86_64-libssh2 mingw-w64-x86_64-python-pip mingw-w64-x86_64-python-wheel mingw-w64-x86_64-python-pyopenssl && python3 -m pip install --prefer-binary impacket configure: --host=x86_64-w64-mingw32 --build=x86_64-w64-mingw32 --prefix=/mingw64 --enable-werror --enable-sspi --with-schannel --with-winidn --with-libssh2 --enable-websockets tests: "~571" + make_cmd: make V=1 - name: Windows 64-bit static/release Schannel/SSPI/WinIDN/libssh2 env: container_img: ghcr.io/mback2k/curl-docker-winbuildenv/msys2-mingw64:ltsc2019 @@ -113,7 +115,7 @@ windows_task: prepare: pacman -S --needed --noconfirm --noprogressbar libssh2-devel mingw-w64-x86_64-libssh2 mingw-w64-x86_64-python-pip mingw-w64-x86_64-python-wheel mingw-w64-x86_64-python-pyopenssl && python3 -m pip install --prefer-binary impacket configure: --host=x86_64-w64-mingw32 --build=x86_64-w64-mingw32 --prefix=/mingw64 --enable-werror --enable-sspi --with-schannel --with-winidn --with-libssh2 --disable-shared --enable-static --enable-websockets tests: "~571" - curl_LDFLAGS: -all-static + make_cmd: make LDFLAGS=-all-static V=1 PKG_CONFIG: pkg-config --static env: @@ -126,11 +128,11 @@ windows_task: configure_script: | %container_cmd% -l -c "cd $(echo '%cd%') && autoreconf -fi && ./configure %configure%" compile_script: | - %container_cmd% -l -c "cd $(echo '%cd%') && make V=1 && make V=1 examples && cd tests && make V=1" + %container_cmd% -l -c "cd $(echo '%cd%') && %make_cmd% && %make_cmd% examples && cd tests && %make_cmd%" install_script: | - %container_cmd% -l -c "cd $(echo '%cd%') && make V=1 install && PATH=/usr/bin:/bin find . -type f -path '*/.libs/*.exe' -print -execdir mv -t .. {} \;" + %container_cmd% -l -c "cd $(echo '%cd%') && %make_cmd% install && PATH=/usr/bin:/bin find . -type f -path '*/.libs/*.exe' -print -execdir mv -t .. {} \;" test_script: | - %container_cmd% -l -c "cd $(echo '%cd%') && make V=1 TFLAGS='!IDN !SCP ~612 ~1056 %tests%' test-ci" + %container_cmd% -l -c "cd $(echo '%cd%') && %make_cmd% TFLAGS='!IDN !SCP ~612 ~1056 %tests%' test-ci" macos_task: name: macOS arm64 normal |