From: Martin Jansa Date: Sat, 18 Jan 2014 14:01:51 +0000 (+0100) Subject: icecc: Don't replace non-empty PARALLEL_MAKE with empty ICECC_PARALLEL_MAKE X-Git-Tag: lucaceresoli/bug-15201-perf-libtraceevent-missing~34814 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7e586d5b7c8c7f20eafc32624200f60a8ed9a582;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git 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 Signed-off-by: Richard Purdie --- diff --git a/meta/classes/icecc.bbclass b/meta/classes/icecc.bbclass index 7147d2f7af9..5af764dddb0 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):