vera/nuclide
4
0
Fork 0
Code Issues 32 Pull requests Projects Releases Packages Activity

vmap: don't blindly query for nproc, as it's not available on BSD. so let's do it the right way

Browse source
This commit is contained in:
Marco Cawthorne 2021-05-17 18:23:21 +02:00
parent 975395a8e6
commit 5d1a48d0ad
1 changed files with 14 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
vmap
View file

@ -7,10 +7,22 @@ if [ ! -f "$SCRPATH"/bin/vmap ]; then
exit
fi
# Check how many cores/processors we should use for building
if ! [ -x "$(command -v nproc)" ]; then
# check if we're on OpenBSD then
if ! [ -x "$(command -v sysctl)" ]; then
BUILD_PROC=1
else
BUILD_PROC=$(sysctl -n hw.ncpu)
fi
else
BUILD_PROC=$(nproc)
fi
set -e
if [ "$VMAP_NOBSP" != "1" ]; then
"$SCRPATH"/bin/vmap -v -custinfoparms -fs_basepath "$SCRPATH" -fs_game platform -threads $(nproc) -samplesize 8 $*
"$SCRPATH"/bin/vmap -v -custinfoparms -fs_basepath "$SCRPATH" -fs_game platform -threads $BUILD_PROC -samplesize 8 $*
fi
if [ "$VMAP_NOVIS" != "1" ]; then
@ -18,5 +30,5 @@ if [ "$VMAP_NOVIS" != "1" ]; then
fi
if [ "$VMAP_NOLIGHT" != "1" ]; then
"$SCRPATH"/bin/vmap -light -custinfoparms -fs_basepath "$SCRPATH" -v -fs_game platform -bounce 8 -fastbounce -samplesize 8 -threads $(nproc) -shade -shadeangle 60 -patchshadows $*
"$SCRPATH"/bin/vmap -light -custinfoparms -fs_basepath "$SCRPATH" -v -fs_game platform -bounce 8 -fastbounce -samplesize 8 -threads $BUILD_PROC -shade -shadeangle 60 -patchshadows $*
fi