diff options
| -rwxr-xr-x | do_cmake.sh | 3 | ||||
| -rwxr-xr-x | do_freebsd.sh | 10 |
2 files changed, 3 insertions, 10 deletions
diff --git a/do_cmake.sh b/do_cmake.sh index 739da8e5b0c..b8e092d1332 100755 --- a/do_cmake.sh +++ b/do_cmake.sh @@ -13,7 +13,8 @@ fi mkdir build cd build -cmake -DBOOST_J=$(nproc) $ARGS "$@" .. +NPROC=${NPROC:-$(nproc)} +cmake -DBOOST_J=$NPROC $ARGS "$@" .. # minimal config to find plugins cat <<EOF > ceph.conf diff --git a/do_freebsd.sh b/do_freebsd.sh index bf9007488f0..2cfa8fa6a7c 100755 --- a/do_freebsd.sh +++ b/do_freebsd.sh @@ -1,14 +1,6 @@ #!/bin/sh -xve -NPROC=`sysctl -n hw.ncpu` +export NPROC=`sysctl -n hw.ncpu` -# we need bash first otherwise almost nothing will work -if [ ! -L /bin/bash ]; then - echo install bash and link /bin/bash to /usr/local/bin/bash - echo Run: - echo sudo pkg install bash - echo ln -s /usr/local/bin/bash /bin/bash - exit 1 -fi if [ x"$1"x = x"--deps"x ]; then sudo ./install-deps.sh fi |