diff options
Diffstat (limited to 'meta/conf/distro')
-rw-r--r-- | meta/conf/distro/include/csl-versions.inc | 3 | ||||
-rw-r--r-- | meta/conf/distro/include/tcmode-external-sourcery.inc | 8 |
2 files changed, 3 insertions, 8 deletions
diff --git a/meta/conf/distro/include/csl-versions.inc b/meta/conf/distro/include/csl-versions.inc index e8f52d272d..f3b491cb16 100644 --- a/meta/conf/distro/include/csl-versions.inc +++ b/meta/conf/distro/include/csl-versions.inc @@ -88,8 +88,6 @@ def csl_get_gdb_version(d): return first_line.split()[-1] python csl_version_handler () { - if not isinstance(e, bb.event.ConfigParsed): - return d = e.data ld = d.createCopy() ld.finalize() @@ -101,6 +99,7 @@ python csl_version_handler () { d.setVar('CSL_VER_GDB', csl_get_gdb_version(ld)) } addhandler csl_version_handler +csl_version_handler[eventmask] = "bb.event.ConfigParsed" # Ensure that any variable which includes the --sysroot (CC, CXX, etc) also # depends on the toolchain version diff --git a/meta/conf/distro/include/tcmode-external-sourcery.inc b/meta/conf/distro/include/tcmode-external-sourcery.inc index 098c724e02..53e6653e79 100644 --- a/meta/conf/distro/include/tcmode-external-sourcery.inc +++ b/meta/conf/distro/include/tcmode-external-sourcery.inc @@ -79,9 +79,6 @@ EXTERNAL_TOOLCHAIN_SYSROOT_CMD += "${@csl_multilib_arg(d)}" # to our staging toolchain bindir. python toolchain_metadata_setup () { - if not isinstance(e, bb.event.ConfigParsed): - return - d = e.data l = d.createCopy() @@ -90,17 +87,16 @@ python toolchain_metadata_setup () { d.setVar('TOOLCHAIN_PATH_ADD', '') } addhandler toolchain_metadata_setup +toolchain_metadata_setup[eventmask] = "bb.event.ConfigParsed" python toolchain_setup () { - if not isinstance(e, bb.event.BuildStarted): - return - d = e.data if not d.getVar('TOOLCHAIN_PATH_ADD', True): populate_toolchain_links(d) } addhandler toolchain_setup +toolchain_setup[eventmask] = "bb.event.BuildStarted" def populate_toolchain_links(d): import errno |