summaryrefslogtreecommitdiff
path: root/script/build-libgit2.sh
diff options
context:
space:
mode:
authorlhchavez <[email protected]>2020-12-06 11:55:04 -0800
committerGitHub <[email protected]>2020-12-06 11:55:04 -0800
commitabf02bc7d79dfb7b0bbcd404ebecb202cff2a18e (patch)
treeec93caf1ed9238b91e7ec6a1c1e470441860f6fc /script/build-libgit2.sh
parent54afccfa0f5a5574525cbba3b4568cbda252a3df (diff)
Add `NewCredentialSSHKeyFromSigner` (#706)
This change adds `NewCredentialSSHKeyFromSigner`, which allows idiomatic use of SSH keys from Go. This also lets us spin off an SSH server in the tests.
Diffstat (limited to 'script/build-libgit2.sh')
-rwxr-xr-xscript/build-libgit2.sh12
1 files changed, 6 insertions, 6 deletions
diff --git a/script/build-libgit2.sh b/script/build-libgit2.sh
index e9c6c9c..a9ff2a9 100755
--- a/script/build-libgit2.sh
+++ b/script/build-libgit2.sh
@@ -69,11 +69,11 @@ cmake -DTHREADSAFE=ON \
-DCMAKE_INSTALL_PREFIX="${BUILD_INSTALL_PREFIX}" \
-DCMAKE_INSTALL_LIBDIR="lib" \
-DDEPRECATE_HARD=ON \
- "${VENDORED_PATH}" &&
+ "${VENDORED_PATH}"
-if which gmake nproc >/dev/null && [ -f Makefile ]; then
- # Make the build parallel if gmake is available and cmake used Makefiles.
- exec gmake "-j$(nproc --all)" install
+if which make nproc >/dev/null && [ -f Makefile ]; then
+ # Make the build parallel if make is available and cmake used Makefiles.
+ exec make "-j$(nproc --all)" install
+else
+ exec cmake --build . --target install
fi
-
-exec cmake --build . --target install