summaryrefslogtreecommitdiffstats
path: root/meta/classes
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-21 10:20:12 +0000
commita7b97cbccceced9e38adf133bd4d80749213dbfc (patch)
tree84510770c346c128a4e767d8ecc650ffc3a249a4 /meta/classes
parent94802fd6fca487606faa2a5b0effe83f1b8dde7c (diff)
downloadpoky-a7b97cbccceced9e38adf133bd4d80749213dbfc.tar.gz
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. (From OE-Core rev: 7e586d5b7c8c7f20eafc32624200f60a8ed9a582) Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes')
-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):
147 return "" 147 return ""
148 148
149 parallel = d.getVar('ICECC_PARALLEL_MAKE') or "" 149 parallel = d.getVar('ICECC_PARALLEL_MAKE') or ""
150 if not d.getVar('PARALLEL_MAKE') == "": 150 if not d.getVar('PARALLEL_MAKE') == "" and parallel:
151 d.setVar("PARALLEL_MAKE", parallel) 151 d.setVar("PARALLEL_MAKE", parallel)
152 152
153 if icc_is_native(bb, d): 153 if icc_is_native(bb, d):