From 085941279b6b799aed003594fdc7b2786f93d5d8 Mon Sep 17 00:00:00 2001 From: Alexander Kanavin Date: Thu, 24 Feb 2022 16:03:00 +0100 Subject: base/staging: use HOST_PREFIX, not TARGET_PREFIX This matters when cross-compiling a cross-toolchain: we need to specify the system where the toolchain will run, not the system it will produce output for. For everything else, HOST and TARGET are the same. (From OE-Core rev: 03679622c5d1088e96d3d2a444c99021e5ae6ee6) Signed-off-by: Alexander Kanavin Signed-off-by: Richard Purdie --- meta/classes/base.bbclass | 2 +- meta/classes/staging.bbclass | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/meta/classes/base.bbclass b/meta/classes/base.bbclass index d0e669db00..55f654d37d 100644 --- a/meta/classes/base.bbclass +++ b/meta/classes/base.bbclass @@ -71,7 +71,7 @@ def get_base_dep(d): return "" return "${BASE_DEFAULT_DEPS}" -BASE_DEFAULT_DEPS = "virtual/${TARGET_PREFIX}gcc virtual/${TARGET_PREFIX}compilerlibs virtual/libc" +BASE_DEFAULT_DEPS = "virtual/${HOST_PREFIX}gcc virtual/${HOST_PREFIX}compilerlibs virtual/libc" BASEDEPENDS = "" BASEDEPENDS:class-target = "${@get_base_dep(d)}" diff --git a/meta/classes/staging.bbclass b/meta/classes/staging.bbclass index 65499283da..ab827766be 100644 --- a/meta/classes/staging.bbclass +++ b/meta/classes/staging.bbclass @@ -119,8 +119,8 @@ do_populate_sysroot[vardeps] += "${SYSROOT_PREPROCESS_FUNCS}" do_populate_sysroot[vardepsexclude] += "BB_MULTI_PROVIDER_ALLOWED" POPULATESYSROOTDEPS = "" -POPULATESYSROOTDEPS:class-target = "virtual/${MLPREFIX}${TARGET_PREFIX}binutils:do_populate_sysroot" -POPULATESYSROOTDEPS:class-nativesdk = "virtual/${TARGET_PREFIX}binutils-crosssdk:do_populate_sysroot" +POPULATESYSROOTDEPS:class-target = "virtual/${MLPREFIX}${HOST_PREFIX}binutils:do_populate_sysroot" +POPULATESYSROOTDEPS:class-nativesdk = "virtual/${HOST_PREFIX}binutils-crosssdk:do_populate_sysroot" do_populate_sysroot[depends] += "${POPULATESYSROOTDEPS}" SSTATETASKS += "do_populate_sysroot" -- cgit v1.2.3-54-g00ecf