diff options
| author |   Juro Bystricky <juro.bystricky@intel.com> | 2016-10-08 10:53:53 -0700 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-10-08 23:06:26 +0100 |
| commit | 2810671a0f96776c135137f27a5ca52194ddd692 (patch) | |
| tree | 4f7b9bff5d97c03d4e9d246b99feac8d9b0acffb | |
| parent | 747f59f5103995654f2b10a52d1dfd2dd4ad1a0e (diff) | |
| download | openembedded-core-contrib-2810671a0f96776c135137f27a5ca52194ddd692.tar.gz | |
libgcc-common.inc: Fix broken symlinks for multilib SDK
This patch fixes broken "32" symlinks for multilib settings:
MACHINE = "qemuarm64"
require conf/multilib.conf
MULTILIBS = "multilib:lib32"
DEFAULTTUNE_virtclass-multilib-lib32 = "armv7a"
and
MACHINE = "qemux86-64"
require conf/multilib.conf
MULTILIBS = "multilib:libx32"
DEFAULTTUNE_virtclass-multilib-libx32 = "x86-64-x32"
[YOCTO#8642]
[YOCTO#10380]
Signed-off-by: Juro Bystricky <juro.bystricky@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | meta/recipes-devtools/gcc/libgcc-common.inc | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/meta/recipes-devtools/gcc/libgcc-common.inc b/meta/recipes-devtools/gcc/libgcc-common.inc index 1549eb4b626..8a13f542c12 100644 --- a/meta/recipes-devtools/gcc/libgcc-common.inc +++ b/meta/recipes-devtools/gcc/libgcc-common.inc @@ -111,9 +111,15 @@ fakeroot python do_multilib_install() { if not tune_bitness: tune_bitness = '32' # /lib => 32bit lib + tune_abiextension = tune_parameters['abiextension'] + if tune_abiextension: + libcextension = '-gnu' + tune_abiextension + else: + libcextension = '' + src = '../../../' + tune_baselib + '/' + \ tune_arch + d.getVar('TARGET_VENDOR', True) + 'ml' + ml + \ - '-' + d.getVar('TARGET_OS', True) + '/' + binv + '/' + '-' + d.getVar('TARGET_OS', True) + libcextension + '/' + binv + '/' dest = d.getVar('D', True) + d.getVar('libdir', True) + '/' + \ d.getVar('TARGET_SYS', True) + '/' + binv + '/' + tune_bitness |