[prev in list] [next in list] [prev in thread] [next in thread] 

List:       gentoo-dev
Subject:    [gentoo-dev] [PATCH 1/2] cmake-utils.eclass: _ninjaopts_from_makeopts, fix handling of -k
From:       Michał Górny <mgorny () gentoo ! org>
Date:       2016-02-28 19:01:57
Message-ID: 1456686118-28043-2-git-send-email-mgorny () gentoo ! org
[Download RAW message or body]

Fix _ninjaopts_from_makeopts to handle -k correctly. Make does not
support parameters to -k, while ninja requires one. Therefore, handle
only a single '-k' and convert it into '-k 0' (no limit of failing
tasks).
---
 eclass/cmake-utils.eclass | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/eclass/cmake-utils.eclass b/eclass/cmake-utils.eclass
index b607132..f5ed1eb 100644
--- a/eclass/cmake-utils.eclass
+++ b/eclass/cmake-utils.eclass
@@ -659,14 +659,19 @@ _ninjaopts_from_makeopts() {
 	set -- ${MAKEOPTS}
 	while (( $# )); do
 		case $1 in
-			-j|-l|-k)
+			-j|-l)
 				ninjaopts+=( $1 $2 )
 				shift 2
 				;;
-			-j*|-l*|-k*)
+			-j*|-l*)
 				ninjaopts+=( $1 )
 				shift 1
 				;;
+			-k)
+				# -k 0 = any number of tasks can fail
+				ninjaopts+=( $1 0 )
+				shift 1
+				;;
 			*) shift ;;
 		esac
 	done
-- 
2.7.2


[prev in list] [next in list] [prev in thread] [next in thread]