From b9353404483e8bf827ac748531e0a3bb9a9912ff Mon Sep 17 00:00:00 2001 From: Ivailo Monev Date: Wed, 25 Nov 2020 23:12:43 +0000 Subject: [PATCH] invoke make from minsize.sh and debug.sh in FreeBSD and Solari compatible way FreeBSD does not have `nproc` and Solaris (OpenIndiana) uses dmake which requires space separator to recognize the jobs argument Signed-off-by: Ivailo Monev --- scripts/debug.sh | 2 +- scripts/minsize.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/debug.sh b/scripts/debug.sh index 4c02361a8..86bcf6ad2 100755 --- a/scripts/debug.sh +++ b/scripts/debug.sh @@ -17,4 +17,4 @@ export LDFLAGS="$LDFLAGS -Wall -fsanitize=$sanitizers" cmake ../ -DCMAKE_BUILD_TYPE=Debug \ -DCMAKE_INSTALL_PREFIX=/usr $@ -make -j$(nproc || echo 1) +make -j $(nproc || sysctl -n hw.ncpu || echo 1) diff --git a/scripts/minsize.sh b/scripts/minsize.sh index 91b54fab2..790320b95 100755 --- a/scripts/minsize.sh +++ b/scripts/minsize.sh @@ -13,4 +13,4 @@ export CXXFLAGS="$CXXFLAGS -flto -fno-exceptions" cmake ../ -DCMAKE_BUILD_TYPE=MinSizeRel \ -DCMAKE_INSTALL_PREFIX=/usr $@ -make -j$(nproc || echo 1) +make -j $(nproc || sysctl -n hw.ncpu || echo 1)