summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexander Kanavin <alex.kanavin@gmail.com>2022-02-24 16:03:00 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2022-02-25 15:30:04 +0000
commit085941279b6b799aed003594fdc7b2786f93d5d8 (patch)
treecb92745753954ac1bdb2c172d842a96f8700c2c4
parentc99211fa6fca4917ebd542ed3c098a4dccaeb1b4 (diff)
downloadpoky-085941279b6b799aed003594fdc7b2786f93d5d8.tar.gz
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 <alex@linutronix.de> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/classes/base.bbclass2
-rw-r--r--meta/classes/staging.bbclass4
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):
71 return "" 71 return ""
72 return "${BASE_DEFAULT_DEPS}" 72 return "${BASE_DEFAULT_DEPS}"
73 73
74BASE_DEFAULT_DEPS = "virtual/${TARGET_PREFIX}gcc virtual/${TARGET_PREFIX}compilerlibs virtual/libc" 74BASE_DEFAULT_DEPS = "virtual/${HOST_PREFIX}gcc virtual/${HOST_PREFIX}compilerlibs virtual/libc"
75 75
76BASEDEPENDS = "" 76BASEDEPENDS = ""
77BASEDEPENDS:class-target = "${@get_base_dep(d)}" 77BASEDEPENDS: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}"
119do_populate_sysroot[vardepsexclude] += "BB_MULTI_PROVIDER_ALLOWED" 119do_populate_sysroot[vardepsexclude] += "BB_MULTI_PROVIDER_ALLOWED"
120 120
121POPULATESYSROOTDEPS = "" 121POPULATESYSROOTDEPS = ""
122POPULATESYSROOTDEPS:class-target = "virtual/${MLPREFIX}${TARGET_PREFIX}binutils:do_populate_sysroot" 122POPULATESYSROOTDEPS:class-target = "virtual/${MLPREFIX}${HOST_PREFIX}binutils:do_populate_sysroot"
123POPULATESYSROOTDEPS:class-nativesdk = "virtual/${TARGET_PREFIX}binutils-crosssdk:do_populate_sysroot" 123POPULATESYSROOTDEPS:class-nativesdk = "virtual/${HOST_PREFIX}binutils-crosssdk:do_populate_sysroot"
124do_populate_sysroot[depends] += "${POPULATESYSROOTDEPS}" 124do_populate_sysroot[depends] += "${POPULATESYSROOTDEPS}"
125 125
126SSTATETASKS += "do_populate_sysroot" 126SSTATETASKS += "do_populate_sysroot"