From c1148330a141e05a522d6ebffd5ef91086b9400b Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Fri, 31 Jul 2015 11:28:22 +0100 Subject: libgcc: Fix symlink handling in cross-arch multilib cases The symlink being generated needs to match both the current arch (e.g. mips or mips64) but also use the underlying TARGET_SYS without multilib extensions to TARGET_VENDOR or extensions to TARGET_OS. The way multilib changes TARGET_VENDOR meant this code did not have a way of removing that change. The method of removing some TARGET_OS suffixes was also not working. By using immediate expansion to run this code, we can run before the multilib code changes it and get the original values. We then use the *current* TARGET_ARCH value in case this does get changed by the multilib since we need to point at the right compiler (32 bit one for 32 bit code). (From OE-Core rev: 89cd6c244b6bc0a8cb52ec84d378d5b305df030f) Signed-off-by: Richard Purdie --- meta/recipes-devtools/gcc/libgcc-common.inc | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) (limited to 'meta/recipes-devtools/gcc/libgcc-common.inc') diff --git a/meta/recipes-devtools/gcc/libgcc-common.inc b/meta/recipes-devtools/gcc/libgcc-common.inc index 3101762b02..22da03b4c0 100644 --- a/meta/recipes-devtools/gcc/libgcc-common.inc +++ b/meta/recipes-devtools/gcc/libgcc-common.inc @@ -116,23 +116,23 @@ fakeroot python do_multilib_install() { os.symlink(src, dest) } +def get_original_vendoros(d): + vendoros = d.expand('${TARGET_VENDOR}-${TARGET_OS}') + for suffix in [d.getVar('ABIEXTENSION', True), d.getVar('LIBCEXTENSION', True)]: + if suffix and vendoros.endswith(suffix): + vendoros = vendoros[:-len(suffix)] + return vendoros + +ORIG_TARGET_VENDOROS := "${@get_original_vendoros(d)}" +BASETARGET_SYS = "${TARGET_ARCH}${ORIG_TARGET_VENDOROS}" + addtask extra_symlinks after do_multilib_install before do_package do_populate_sysroot fakeroot python do_extra_symlinks() { - targetsysnoext = d.getVar('TARGET_SYS_NO_EXTENSION', True) + targetsys = d.getVar('BASETARGET_SYS', True) - if targetsysnoext != d.getVar('TARGET_SYS', True): - dest = d.getVar('D', True) + d.getVar('libdir', True) + '/' + targetsysnoext + if targetsys != d.getVar('TARGET_SYS', True): + dest = d.getVar('D', True) + d.getVar('libdir', True) + '/' + targetsys src = d.getVar('TARGET_SYS', True) if not os.path.lexists(dest) and os.path.lexists(d.getVar('D', True) + d.getVar('libdir', True)): os.symlink(src, dest) } - -python () { - targetsysnoext = d.getVar('TARGET_SYS', True) - - for suffix in [d.getVar('ABIEXTENSION', True), d.getVar('LIBCEXTENSION', True)]: - if suffix and targetsysnoext.endswith(suffix): - targetsysnoext = targetsysnoext[:-len(suffix)] - - d.setVar('TARGET_SYS_NO_EXTENSION', targetsysnoext) -} -- cgit 1.2.3-korg