summaryrefslogtreecommitdiffstats
path: root/meta/classes
diff options
context:
space:
mode:
authorJoshua Watt <jpewhacker@gmail.com>2018-04-10 21:21:58 -0500
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-04-13 16:58:07 +0100
commit089cd3bf550fba896d1cff446d885149db4f9d26 (patch)
tree12c44c72897f741a64c841dcf294a2741cd72ddb /meta/classes
parent2400cbbfbc130a89fe33ac860eae03f3200767a8 (diff)
downloadpoky-089cd3bf550fba896d1cff446d885149db4f9d26.tar.gz
icecc.bbclass: Add ICECC_ENV_DEBUG variable
The ICECC_ENV_DEBUG variable can be set in local.conf to pass additional debugging options to the Icecream toolchain creation script. (From OE-Core rev: be913284bb34ebf4a71770646044603a2a27d01b) Signed-off-by: Joshua Watt <JPEWhacker@gmail.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes')
-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 cab64f5270..aea1095f5f 100644
--- a/meta/classes/icecc.bbclass
+++ b/meta/classes/icecc.bbclass
@@ -33,6 +33,7 @@ BB_HASHBASE_WHITELIST += "ICECC_PARALLEL_MAKE ICECC_DISABLED ICECC_USER_PACKAGE_
33 ICECC_CARET_WORKAROUND ICECC_CFLAGS ICECC_ENV_VERSION \ 33 ICECC_CARET_WORKAROUND ICECC_CFLAGS ICECC_ENV_VERSION \
34 ICECC_DEBUG ICECC_LOGFILE ICECC_REPEAT_RATE ICECC_PREFERRED_HOST \ 34 ICECC_DEBUG ICECC_LOGFILE ICECC_REPEAT_RATE ICECC_PREFERRED_HOST \
35 ICECC_CLANG_REMOTE_CPP ICECC_IGNORE_UNVERIFIED ICECC_TEST_SOCKET \ 35 ICECC_CLANG_REMOTE_CPP ICECC_IGNORE_UNVERIFIED ICECC_TEST_SOCKET \
36 ICECC_ENV_DEBUG \
36 " 37 "
37 38
38ICECC_ENV_EXEC ?= "${STAGING_BINDIR_NATIVE}/icecc-create-env" 39ICECC_ENV_EXEC ?= "${STAGING_BINDIR_NATIVE}/icecc-create-env"
@@ -57,6 +58,9 @@ ICECC_CFLAGS = ""
57CFLAGS += "${ICECC_CFLAGS}" 58CFLAGS += "${ICECC_CFLAGS}"
58CXXFLAGS += "${ICECC_CFLAGS}" 59CXXFLAGS += "${ICECC_CFLAGS}"
59 60
61# Debug flags when generating environments
62ICECC_ENV_DEBUG ??= ""
63
60def icecc_dep_prepend(d): 64def icecc_dep_prepend(d):
61 # INHIBIT_DEFAULT_DEPS doesn't apply to the patch command. Whether or not 65 # INHIBIT_DEFAULT_DEPS doesn't apply to the patch command. Whether or not
62 # we need that built is the responsibility of the patch function / class, not 66 # we need that built is the responsibility of the patch function / class, not
@@ -363,7 +367,7 @@ set_icecc_env() {
363 # the ICECC_VERSION generation step must be locked by a mutex 367 # the ICECC_VERSION generation step must be locked by a mutex
364 # in order to prevent race conditions 368 # in order to prevent race conditions
365 if flock -n "${ICECC_VERSION}.lock" \ 369 if flock -n "${ICECC_VERSION}.lock" \
366 ${ICECC_ENV_EXEC} "${ICECC_CC}" "${ICECC_CXX}" "${ICECC_AS}" "${ICECC_VERSION}" 370 ${ICECC_ENV_EXEC} ${ICECC_ENV_DEBUG} "${ICECC_CC}" "${ICECC_CXX}" "${ICECC_AS}" "${ICECC_VERSION}"
367 then 371 then
368 touch "${ICECC_VERSION}.done" 372 touch "${ICECC_VERSION}.done"
369 elif [ ! wait_for_file "${ICECC_VERSION}.done" 30 ] 373 elif [ ! wait_for_file "${ICECC_VERSION}.done" 30 ]