From 965029e3952a27dfac7db8ee82124dd815d266f7 Mon Sep 17 00:00:00 2001 From: Kim De Mey Date: Fri, 26 Jul 2024 16:18:18 +0200 Subject: [PATCH] Use the make question option to avoid rebuild on macOS (#68) There was already the earlier strange ` before the "unity.a' is up to date message on macOS. Turns out it might still not work on macOS because of certain verbosity levels. So use the question option instead of dry-run + grep as the latter is more brittle, and the former is intended for this purpose. --- scripts/build_static_deps.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/build_static_deps.sh b/scripts/build_static_deps.sh index 2faf2c5..ff49835 100755 --- a/scripts/build_static_deps.sh +++ b/scripts/build_static_deps.sh @@ -32,7 +32,7 @@ export ROCKSDB_DISABLE_BZIP=1 export PORTABLE=1 export DEBUG_LEVEL=0 -if ${MAKE} -C "${ROCKSDB_LIB_DIR}" --dry-run unity.a | grep -q "unity.a' is up to date."; then +if ${MAKE} -C "${ROCKSDB_LIB_DIR}" -q unity.a; then echo "RocksDb static libraries already built. Skipping build." exit 0 else