aboutsummaryrefslogtreecommitdiffstats
path: root/meta/classes/icecc.bbclass
diff options
context:
space:
mode:
authorDouglas Royds <douglas.royds@taitradio.com>2018-12-20 11:59:48 +1300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2019-01-28 16:56:26 +0000
commit9d3587dda0e068efb72a89fd94002f13882fe335 (patch)
tree21f34b1145f9f48e126f82e3a4890b4e98867371 /meta/classes/icecc.bbclass
parent46db052def5c4fa0de7943262092582c8d897117 (diff)
downloadopenembedded-core-contrib-9d3587dda0e068efb72a89fd94002f13882fe335.tar.gz
icecc: patchelf is needed by icecc-create-env
Although we could potentially build patchelf and all its dependencies, they would all have to be blacklisted to avoid trying to build them with icecc. We use the host patchelf instead. (From OE-Core rev: 0860216a81092fba084d29696db6d0c65a226c85) Signed-off-by: Douglas Royds <douglas.royds@taitradio.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> Signed-off-by: Armin Kuster <akuster808@gmail.com>
Diffstat (limited to 'meta/classes/icecc.bbclass')
-rw-r--r--meta/classes/icecc.bbclass6
1 files changed, 5 insertions, 1 deletions
diff --git a/meta/classes/icecc.bbclass b/meta/classes/icecc.bbclass
index 49597175ca..7d94525d31 100644
--- a/meta/classes/icecc.bbclass
+++ b/meta/classes/icecc.bbclass
@@ -38,7 +38,7 @@ BB_HASHBASE_WHITELIST += "ICECC_PARALLEL_MAKE ICECC_DISABLED ICECC_USER_PACKAGE_
ICECC_ENV_EXEC ?= "${STAGING_BINDIR_NATIVE}/icecc-create-env"
-HOSTTOOLS_NONFATAL += "icecc"
+HOSTTOOLS_NONFATAL += "icecc patchelf"
# This version can be incremented when changes are made to the environment that
# invalidate the version on the compile nodes. Changing it will cause a new
@@ -326,6 +326,10 @@ set_icecc_env() {
bbwarn "Cannot use icecc: icecc binary not found"
return
fi
+ if [ -z "$(which patchelf patchelf-uninative)" ]; then
+ bbwarn "Cannot use icecc: patchelf not found"
+ return
+ fi
# Create symlinks to icecc in the recipe-sysroot directory
mkdir -p ${ICE_PATH}