diff options
| -rw-r--r-- | meta/recipes-devtools/gcc/libgcc-common.inc | 26 | ||||
| -rw-r--r-- | meta/recipes-devtools/gcc/libgcc.inc | 2 |
2 files changed, 14 insertions, 14 deletions
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) -} diff --git a/meta/recipes-devtools/gcc/libgcc.inc b/meta/recipes-devtools/gcc/libgcc.inc index 35432c793e..739adbd968 100644 --- a/meta/recipes-devtools/gcc/libgcc.inc +++ b/meta/recipes-devtools/gcc/libgcc.inc @@ -24,7 +24,7 @@ FILES_${PN}-dev = "\ ${libdir}/${TARGET_SYS}/${BINV}/x32 \ ${libdir}/${TARGET_SYS}/${BINV}/n32 \ ${libdir}/${TARGET_SYS}/${BINV}/libgcc* \ - ${@base_conditional('TARGET_SYS_NO_EXTENSION', '${TARGET_SYS}', '', '${libdir}/${TARGET_SYS_NO_EXTENSION}', d)} \ + ${@base_conditional('BASETARGET_SYS', '${TARGET_SYS}', '', '${libdir}/${BASETARGET_SYS}', d)} \ ${libdir}/${TARGET_SYS}/${BINV}/libgcov.a \ " |