Skip to content

Commit e00cd77

Browse files
authored
have cmake generate ninja templates (#13211)
may be a tad faster/better
1 parent 9d86489 commit e00cd77

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

.github/bin/build_openssl.sh

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,8 @@ elif [[ "${TYPE}" == "libressl" ]]; then
4444
curl -LO "https://ftp.openbsd.org/pub/OpenBSD/LibreSSL/libressl-${VERSION}.tar.gz"
4545
tar zxf "libressl-${VERSION}.tar.gz"
4646
pushd "libressl-${VERSION}"
47-
cmake -B build -DCMAKE_POSITION_INDEPENDENT_CODE=ON -DBUILD_SHARED_LIBS=OFF -DCMAKE_INSTALL_PREFIX="${OSSL_PATH}"
48-
make -C build -j"$(nproc)" install
47+
cmake -GNinja -B build -DCMAKE_POSITION_INDEPENDENT_CODE=ON -DBUILD_SHARED_LIBS=OFF -DCMAKE_INSTALL_PREFIX="${OSSL_PATH}"
48+
ninja -C build install
4949
# delete binaries, libtls, and docs we don't need. can't skip install/compile sadly
5050
rm -rf "${OSSL_PATH}/bin"
5151
rm -rf "${OSSL_PATH}/share"
@@ -55,8 +55,8 @@ elif [[ "${TYPE}" == "boringssl" ]]; then
5555
git clone https://boringssl.googlesource.com/boringssl
5656
pushd boringssl
5757
git checkout "${VERSION}"
58-
cmake -B build -DCMAKE_POSITION_INDEPENDENT_CODE=ON -DCMAKE_INSTALL_PREFIX="${OSSL_PATH}"
59-
make -C build -j"$(nproc)" install
58+
cmake -GNinja -B build -DCMAKE_POSITION_INDEPENDENT_CODE=ON -DCMAKE_INSTALL_PREFIX="${OSSL_PATH}"
59+
ninja -C build install
6060
# delete binaries we don't need
6161
rm -rf "${OSSL_PATH}/bin"
6262
popd
@@ -65,8 +65,8 @@ elif [[ "${TYPE}" == "aws-lc" ]]; then
6565
git clone https://github.com/aws/aws-lc.git
6666
pushd aws-lc
6767
git checkout "${VERSION}"
68-
cmake -B build -DCMAKE_INSTALL_PREFIX="${OSSL_PATH}"
69-
make -C build -j"$(nproc)" install
68+
cmake -GNinja -B build -DCMAKE_INSTALL_PREFIX="${OSSL_PATH}"
69+
ninja -C build install
7070
# delete binaries we don't need
7171
rm -rf "${OSSL_PATH:?}/bin"
7272
popd # aws-lc

0 commit comments

Comments
 (0)