From: Chen Qi <[email protected]> In case of multilib, the values of CC and HOST_ARCH in self.td are not valid for lib32. We need to use the env vars sourced by the env script.
Signed-off-by: Chen Qi <[email protected]> Signed-off-by: Mathieu Dubois-Briand <[email protected]> Signed-off-by: Richard Purdie <[email protected]> (cherry picked from commit 5c08c605c91579d2d21711b77fac484077132ce5) Signed-off-by: Ankur Tyagi <[email protected]> --- meta/lib/oeqa/sdk/cases/meson.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/lib/oeqa/sdk/cases/meson.py b/meta/lib/oeqa/sdk/cases/meson.py index a809ca3a53..7419988922 100644 --- a/meta/lib/oeqa/sdk/cases/meson.py +++ b/meta/lib/oeqa/sdk/cases/meson.py @@ -39,11 +39,11 @@ class MesonTestBase(OESDKTestCase): # Check that the cross-compiler used is the one we set. data = json.loads(self._run(f"meson introspect --compilers {builddir}")) - self.assertIn(self.td.get("CC").split()[0], data["host"]["c"]["exelist"]) + self.assertIn(self._run("echo $CC").split()[0], data["host"]["c"]["exelist"]) # Check that the target architectures was set correctly. data = json.loads(self._run(f"meson introspect --machines {builddir}")) - self.assertEqual(data["host"]["cpu"], self.td["HOST_ARCH"]) + self.assertEqual(data["host"]["cpu"], self._run("echo -n $OECORE_MESON_HOST_CPU")) self._run(f"meson compile -C {builddir} -v")
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#227673): https://lists.openembedded.org/g/openembedded-core/message/227673 Mute This Topic: https://lists.openembedded.org/mt/116760454/21656 Group Owner: [email protected] Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
