diff options
| author | Lawrence D'Oliveiro <from-blender@geek-central.gen.nz> | 2014-02-27 13:01:05 +0400 |
|---|---|---|
| committer | Bastien Montagne <montagne29@wanadoo.fr> | 2014-02-27 13:02:13 +0400 |
| commit | 317f29d753ae601d9c4817769059c7fb2aadfbd1 (patch) | |
| tree | d9d636d722467de645dab467b79a2ff5894efdf7 /build_files | |
| parent | 17d2e6422cfac5c1fe2f66dba94ad76212876eca (diff) | |
Resubmission: Avoid UUOC in install_deps.sh
This is a resubmission of the original patch from D255. Sorry, I didn’t understand that subsequent patches added to a diff are considered to //override// previous ones, rather than add to them.
Basically the comment for commit rB554eca1c288e has been applied to the wrong patch.
Reviewers: mont29
Reviewed By: mont29
Differential Revision: https://developer.blender.org/D359
Diffstat (limited to 'build_files')
| -rwxr-xr-x | build_files/build_environment/install_deps.sh | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/build_files/build_environment/install_deps.sh b/build_files/build_environment/install_deps.sh index 1fadf987b0f..65fbd1bb002 100755 --- a/build_files/build_environment/install_deps.sh +++ b/build_files/build_environment/install_deps.sh @@ -45,10 +45,7 @@ WITH_ALL=false # Do not yet enable opencollada, use --with-opencollada (or --with-all) option to try it. WITH_OPENCOLLADA=false -THREADS=`cat /proc/cpuinfo | grep processor | wc -l` -if [ -z "$THREADS" ]; then - THREADS=1 -fi +THREADS=$(nproc) COMMON_INFO="\"Source code of dependencies needed to be compiled will be downloaded and extracted into '\$SRC'. Built libs of dependencies needed to be compiled will be installed into '\$INST'. |