aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Jansa <martin.jansa@gmail.com>2014-01-18 15:01:51 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-01-19 17:10:57 +0000
commit7e586d5b7c8c7f20eafc32624200f60a8ed9a582 (patch)
tree2adf90a09ecd13456054e294ffc4a3931d0105eb
parent180ba7f6603b35eb66946649d8860022d2c329b7 (diff)
downloadopenembedded-core-contrib-7e586d5b7c8c7f20eafc32624200f60a8ed9a582.tar.gz
openembedded-core-contrib-7e586d5b7c8c7f20eafc32624200f60a8ed9a582.tar.bz2
openembedded-core-contrib-7e586d5b7c8c7f20eafc32624200f60a8ed9a582.zip
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@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/classes/icecc.bbclass2
1 files changed, 1 insertions, 1 deletions
diff --git a/meta/classes/icecc.bbclass b/meta/classes/icecc.bbclass
index 7147d2f7af..5af764dddb 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):