diff options
author | Juro Bystricky <juro.bystricky@intel.com> | 2016-10-08 10:53:53 -0700 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-11-08 23:47:13 +0000 |
commit | 2cb87d12d2bf9ab02e7d295ecb4e17013fb9ec4f (patch) | |
tree | 8fc74eada07d1cb984cf011256da6176e0ec3c49 /meta/recipes-devtools | |
parent | 57531002b8be23ba24ecd53076cd337efa9accbb (diff) | |
download | poky-2cb87d12d2bf9ab02e7d295ecb4e17013fb9ec4f.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]
(From OE-Core rev: 2810671a0f96776c135137f27a5ca52194ddd692)
(From OE-Core rev: 1c9a1b518d4c653799d4f6ca4bc5ef191fa8a349)
Signed-off-by: Juro Bystricky <juro.bystricky@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Signed-off-by: Armin Kuster <akuster808@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools')
-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 dae07e96da..0a6ea64f50 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() { | |||
111 | if not tune_bitness: | 111 | if not tune_bitness: |
112 | tune_bitness = '32' # /lib => 32bit lib | 112 | tune_bitness = '32' # /lib => 32bit lib |
113 | 113 | ||
114 | tune_abiextension = tune_parameters['abiextension'] | ||
115 | if tune_abiextension: | ||
116 | libcextension = '-gnu' + tune_abiextension | ||
117 | else: | ||
118 | libcextension = '' | ||
119 | |||
114 | src = '../../../' + tune_baselib + '/' + \ | 120 | src = '../../../' + tune_baselib + '/' + \ |
115 | tune_arch + d.getVar('TARGET_VENDOR', True) + 'ml' + ml + \ | 121 | tune_arch + d.getVar('TARGET_VENDOR', True) + 'ml' + ml + \ |
116 | '-' + d.getVar('TARGET_OS', True) + '/' + binv + '/' | 122 | '-' + d.getVar('TARGET_OS', True) + libcextension + '/' + binv + '/' |
117 | 123 | ||
118 | dest = d.getVar('D', True) + d.getVar('libdir', True) + '/' + \ | 124 | dest = d.getVar('D', True) + d.getVar('libdir', True) + '/' + \ |
119 | d.getVar('TARGET_SYS', True) + '/' + binv + '/' + tune_bitness | 125 | d.getVar('TARGET_SYS', True) + '/' + binv + '/' + tune_bitness |