diff options
| author | Randy Witt <randy.e.witt@linux.intel.com> | 2015-12-09 12:50:44 -0800 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-01-12 08:42:27 +0000 |
| commit | 3b7df5507588735e5e330a14456b41aa9787dcf1 (patch) | |
| tree | c30a0210d85c9518ee6331ec9566c4045c9e4b53 /meta/classes | |
| parent | f3d7c3f385d0caa2ffdc2532316afd4f21b9877e (diff) | |
| download | poky-3b7df5507588735e5e330a14456b41aa9787dcf1.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 master rev: b78fa0bcadd54bb29b6f1bb3a9308d4c454bf4e2)
(From OE-Core rev: b901a3057ff511f4c8bc730b37b967a93995de2f)
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>
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes')
| -rw-r--r-- | meta/classes/uninative.bbclass | 2 |
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 @@ | |||
| 1 | NATIVELSBSTRING = "universal" | 1 | NATIVELSBSTRING = "universal" |
| 2 | 2 | ||
| 3 | UNINATIVE_LOADER = "${STAGING_DIR_NATIVE}/lib/ld-linux-x86-64.so.2" | 3 | 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)}" |
| 4 | 4 | ||
| 5 | addhandler uninative_eventhandler | 5 | addhandler uninative_eventhandler |
| 6 | uninative_eventhandler[eventmask] = "bb.event.BuildStarted" | 6 | uninative_eventhandler[eventmask] = "bb.event.BuildStarted" |