summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorRandy Witt <randy.e.witt@linux.intel.com>2015-12-09 12:50:44 -0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-12-16 12:12:15 +0000
commita5dd1dd8904c62ef0ca5c208f997453e77860add (patch)
treea559cc36a4ad0f72d76bc8a36d099438bc33c92b /meta
parent388e5802dfa583cf186c906d1851d075431edd3d (diff)
downloadpoky-a5dd1dd8904c62ef0ca5c208f997453e77860add.tar.gz
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] (From OE-Core rev: b78fa0bcadd54bb29b6f1bb3a9308d4c454bf4e2) Signed-off-by: Randy Witt <randy.e.witt@linux.intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/classes/uninative.bbclass2
1 files changed, 1 insertions, 1 deletions
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 @@
1NATIVELSBSTRING = "universal" 1NATIVELSBSTRING = "universal"
2 2
3UNINATIVE_LOADER = "${STAGING_DIR_NATIVE}/lib/ld-linux-x86-64.so.2" 3UNINATIVE_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)}"
4 4
5addhandler uninative_eventhandler 5addhandler uninative_eventhandler
6uninative_eventhandler[eventmask] = "bb.event.BuildStarted" 6uninative_eventhandler[eventmask] = "bb.event.BuildStarted"