[oe-commits] Martin Jansa : icecc: Don' t replace non-empty PARALLEL_MAKE with empty ICECC_PARALLEL_MAKE
git at git.openembedded.org
git at git.openembedded.org
Sun Jan 19 17:14:09 UTC 2014
Module: openembedded-core.git
Branch: master-next
Commit: 7e586d5b7c8c7f20eafc32624200f60a8ed9a582
URL: http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=7e586d5b7c8c7f20eafc32624200f60a8ed9a582
Author: Martin Jansa <martin.jansa at gmail.com>
Date: Sat Jan 18 15:01:51 2014 +0100
icecc: Don't replace non-empty PARALLEL_MAKE with empty ICECC_PARALLEL_MAKE
* it's needed for use-case like this:
# Inherit icecc here, so that all builders have the same sstate signatures
INHERIT_DISTRO += "icecc"
# and then disable its function by default (so that people still need to explicity
# enable it in local.conf if they have configured icecc and want to use it.
# You need to set _empty_ value in local.conf to enable icecc function:
# ICECC_DISABLED = ""
ICECC_DISABLED ??= "1"
* so default ICECC_PARALLEL_MAKE is still empty, but we want build
to respect our PARALLEL_MAKE, unfortunately we cannot do something
like ICECC_PARALLEL_MAKE ??= "${PARALLEL_MAKE}", because that would
cause PARALLEL_MAKE to reference itself.
Signed-off-by: Martin Jansa <Martin.Jansa at gmail.com>
Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
---
meta/classes/icecc.bbclass | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta/classes/icecc.bbclass b/meta/classes/icecc.bbclass
index 7147d2f..5af764d 100644
--- a/meta/classes/icecc.bbclass
+++ b/meta/classes/icecc.bbclass
@@ -147,7 +147,7 @@ def icc_version(bb, d):
return ""
parallel = d.getVar('ICECC_PARALLEL_MAKE') or ""
- if not d.getVar('PARALLEL_MAKE') == "":
+ if not d.getVar('PARALLEL_MAKE') == "" and parallel:
d.setVar("PARALLEL_MAKE", parallel)
if icc_is_native(bb, d):
More information about the Openembedded-commits
mailing list