From b78fa0bcadd54bb29b6f1bb3a9308d4c454bf4e2 Mon Sep 17 00:00:00 2001 From: Randy Witt Date: Wed, 9 Dec 2015 12:50:44 -0800 Subject: uninative.bbclass: Choose the correct loader based on BUILD_ARCH Previously UNINATIVE_LOADER was always ld-linux-x86-64.so.2. That is incorrect when the host is 32-bit. This change also changes to using ?= so the user can override UNINATIVE_LOADER if so desired. [YOCTO #8124] Signed-off-by: Randy Witt Signed-off-by: Ross Burton --- meta/classes/uninative.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'meta/classes/uninative.bbclass') diff --git a/meta/classes/uninative.bbclass b/meta/classes/uninative.bbclass index 51391dbc4a..0cd27db853 100644 --- a/meta/classes/uninative.bbclass +++ b/meta/classes/uninative.bbclass @@ -1,6 +1,6 @@ NATIVELSBSTRING = "universal" -UNINATIVE_LOADER = "${STAGING_DIR_NATIVE}/lib/ld-linux-x86-64.so.2" +UNINATIVE_LOADER ?= "${@bb.utils.contains('BUILD_ARCH', 'x86_64', '${STAGING_DIR_NATIVE}/lib/ld-linux-x86-64.so.2', '${STAGING_DIR_NATIVE}/lib/ld-linux.so.2', d)}" addhandler uninative_eventhandler uninative_eventhandler[eventmask] = "bb.event.BuildStarted" -- cgit 1.2.3-korg