cmake-utils.eclass: _ninjaopts_from_makeopts, fix plain '-j' and '-l'

Fix the _ninjaopts_from_makeopts to handle no-parameter '-j' and '-l'
options correctly and convert them to appropriate parametrized ninja
options.
This commit is contained in:
Michał Górny
2016-02-28 19:42:18 +01:00
parent 65719e6773
commit 58f3cda1c9

View File

@@ -660,8 +660,19 @@ _ninjaopts_from_makeopts() {
while (( $# )); do
case $1 in
-j|-l)
ninjaopts+=( $1 $2 )
shift 2
if [[ $# -eq 1 || $2 == -* ]]; then
if [[ $1 == -j ]]; then
# absurdly high job limit
ninjaopts+=( $1 9999 )
else # -l
# remove load limit (like make does for -l)
ninjaopts+=( $1 0 )
fi
shift 1
else
ninjaopts+=( $1 $2 )
shift 2
fi
;;
-j*|-l*)
ninjaopts+=( $1 )