mirror of
https://git.yoctoproject.org/poky
synced 2026-04-04 05:02:21 +02:00
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>
This commit is contained in:
committed by
Richard Purdie
parent
94802fd6fc
commit
a7b97cbccc
@@ -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):
|
||||
|
||||
Reference in New Issue
Block a user