From bfa67c067f749e6cc9c0733a03207fb77d4e175f Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Mon, 30 Sep 2019 10:34:07 -0700 Subject: clang-runtime: Use INHIBIT_DEFAULT_DEPS = "1" This ensures that clang-runtime elements e.g. llvm-libunwind can be used with gcc as well Signed-off-by: Khem Raj --- classes/clang.bbclass | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) (limited to 'classes/clang.bbclass') diff --git a/classes/clang.bbclass b/classes/clang.bbclass index a8f2c90..2e5bab1 100644 --- a/classes/clang.bbclass +++ b/classes/clang.bbclass @@ -60,7 +60,7 @@ OVERRIDES[vardepsexclude] += "TOOLCHAIN" #DEPENDS_append_toolchain-clang_class-target = " clang-cross-${TARGET_ARCH} " #DEPENDS_remove_toolchain-clang_allarch = "clang-cross-${TARGET_ARCH}" -def clang_dep_prepend(d): +def clang_base_deps(d): if not d.getVar('INHIBIT_DEFAULT_DEPS', False): if not oe.utils.inherits(d, 'allarch') : ret = " clang-cross-${TARGET_ARCH} virtual/libc " @@ -79,10 +79,16 @@ def clang_dep_prepend(d): def clang_remove_deps(d): ret = "" - if (d.getVar('COMPILER_RT').find('--unwindlib=libunwind') != -1): + if (d.getVar('UNWINDLIB').find('--unwindlib=libunwind') != -1): ret += "libunwind" return ret -BASE_DEFAULT_DEPS_toolchain-clang_class-target = "${@clang_dep_prepend(d)}" -DEPENDS_remove_toolchain-clang_class-target = "${@clang_remove_deps(d)}" +def clang_add_deps(d): + ret = "" + if (d.getVar('UNWINDLIB').find('--unwindlib=libunwind') != -1): + ret += " llvm-libunwind " + return ret +BASE_DEFAULT_DEPS_toolchain-clang_class-target = "${@clang_base_deps(d)}" +DEPENDS_remove_class-target = "${@clang_remove_deps(d)}" +BASE_DEFAULT_DEPS_append_class-target = "${@clang_add_deps(d)}" -- cgit v1.2.3-54-g00ecf