[1/3] base/staging: use HOST_PREFIX, not TARGET_PREFIX

Message ID 20220224150302.1341776-2-alex@linutronix.de
State Accepted, archived
Commit 03679622c5d1088e96d3d2a444c99021e5ae6ee6
Headers show
Series Fixes to enable cross-canadian toolchains | expand

Commit Message

Alexander Kanavin Feb. 24, 2022, 3:03 p.m. UTC
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.

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---
 meta/classes/base.bbclass    | 2 +-
 meta/classes/staging.bbclass | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

Patch

diff --git a/meta/classes/base.bbclass b/meta/classes/base.bbclass
index 227f1f5a75..af00b35ca4 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"