From 7fcb7c46b6a380fc294ca00809ebb5afc5a0a7ac Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Wed, 28 Mar 2012 11:13:23 +0000 Subject: gcc-cross-intermediate: Ensure we move the libraries from the correct location This fixes multilib issues if you try for example to use a BASELIB of /lib32 which wouldn't work without this change since the compiler install location is taken from gcc -print-multi-os-directory which can still turn out to be "/lib". The reason is that a 32 bit gcc has no multilib code enabled and will always return "." as that value rather than "../${base_libdir}" which our changes to gcc enable and return in 64 bit mode. (From OE-Core rev: cc953e2259bf77e9e1f7a1e3d0dbe1509c79477e) Signed-off-by: Richard Purdie --- meta/recipes-devtools/gcc/gcc-cross-intermediate.inc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'meta/recipes-devtools/gcc') diff --git a/meta/recipes-devtools/gcc/gcc-cross-intermediate.inc b/meta/recipes-devtools/gcc/gcc-cross-intermediate.inc index ea105e6eb0..316a7647ec 100644 --- a/meta/recipes-devtools/gcc/gcc-cross-intermediate.inc +++ b/meta/recipes-devtools/gcc/gcc-cross-intermediate.inc @@ -37,7 +37,8 @@ do_compile () { do_install () { oe_runmake 'DESTDIR=${D}' install install -d ${D}${target_base_libdir}/ - mv ${D}${exec_prefix}/${TARGET_SYS}/${baselib}/* ${D}${target_base_libdir}/ + osdir=`${D}${STAGING_BINDIR_TOOLCHAIN}.${PN}/${TARGET_PREFIX}gcc -print-multi-os-directory` + mv ${D}${exec_prefix}/${TARGET_SYS}/lib/$osdir/* ${D}${target_base_libdir}/ # We don't really need this (here shares/ contains man/, info/, locale/). rm -rf ${D}${datadir}/ -- cgit v1.2.3-54-g00ecf