mirror of
https://github.com/curl/curl.git
synced 2026-08-03 17:50:28 +03:00
GHA: always use Ninja on macos runners
It's installed by default on the macos runners now. Closes #17115
This commit is contained in:
parent
4c20eb7108
commit
a366552243
4 changed files with 11 additions and 6 deletions
4
.github/workflows/non-native.yml
vendored
4
.github/workflows/non-native.yml
vendored
|
|
@ -319,7 +319,7 @@ jobs:
|
|||
https://github.com/libressl/portable/releases/download/v${{ env.libressl-version }}/libressl-${{ env.libressl-version }}.tar.gz | tar -x
|
||||
cd libressl-${{ env.libressl-version }}
|
||||
# FIXME: on the 4.0.1 release, delete '-DHAVE_ENDIAN_H=0'
|
||||
cmake -B . \
|
||||
cmake -B . -G Ninja \
|
||||
-DHAVE_ENDIAN_H=0 \
|
||||
-DCMAKE_INSTALL_PREFIX="$HOME/libressl" \
|
||||
-DCMAKE_SYSTEM_NAME=iOS \
|
||||
|
|
@ -343,7 +343,7 @@ jobs:
|
|||
if [ -n '${{ matrix.build.generate }}' ]; then
|
||||
# https://cmake.org/cmake/help/latest/manual/cmake-toolchains.7.html#cross-compiling-for-ios-tvos-visionos-or-watchos
|
||||
[ -n '${{ matrix.build.generator }}' ] && options='-G ${{ matrix.build.generator }}'
|
||||
cmake -B bld -D_CURL_PREFILL=ON \
|
||||
cmake -B bld -G Ninja -D_CURL_PREFILL=ON \
|
||||
-DCMAKE_UNITY_BUILD=ON -DCURL_TEST_BUNDLES=ON -DCURL_WERROR=ON \
|
||||
-DCMAKE_SYSTEM_NAME=iOS \
|
||||
-DUSE_APPLE_IDN=ON \
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue