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> | 2015-12-16 12:11:22 +0000 |
| commit | b78fa0bcadd54bb29b6f1bb3a9308d4c454bf4e2 (patch) | |
| tree | 3a39c710d83fd93e368633ca35a8d3704799e6c6 | |
| parent | 697072130a3298aede7166f125aa982be23793ca (diff) | |
| download | openembedded-core-b78fa0bcadd54bb29b6f1bb3a9308d4c454bf4e2.tar.gz openembedded-core-b78fa0bcadd54bb29b6f1bb3a9308d4c454bf4e2.tar.bz2 openembedded-core-b78fa0bcadd54bb29b6f1bb3a9308d4c454bf4e2.zip | |
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 <randy.e.witt@linux.intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
| -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 @@ 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" |