summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools/gcc
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2012-03-28 11:13:23 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-03-28 15:53:08 (GMT)
commit7fcb7c46b6a380fc294ca00809ebb5afc5a0a7ac (patch)
tree5b4a9d9196fb1ada47c56eee61c9b7bce7020fb6 /meta/recipes-devtools/gcc
parentc39e0dbf3baa5a0c3383b805d307f20518d5cf54 (diff)
downloadpoky-7fcb7c46b6a380fc294ca00809ebb5afc5a0a7ac.tar.gz
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 <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/gcc')
-rw-r--r--meta/recipes-devtools/gcc/gcc-cross-intermediate.inc3
1 files changed, 2 insertions, 1 deletions
diff --git a/meta/recipes-devtools/gcc/gcc-cross-intermediate.inc b/meta/recipes-devtools/gcc/gcc-cross-intermediate.inc
index ea105e6..316a764 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 () {
37do_install () { 37do_install () {
38 oe_runmake 'DESTDIR=${D}' install 38 oe_runmake 'DESTDIR=${D}' install
39 install -d ${D}${target_base_libdir}/ 39 install -d ${D}${target_base_libdir}/
40 mv ${D}${exec_prefix}/${TARGET_SYS}/${baselib}/* ${D}${target_base_libdir}/ 40 osdir=`${D}${STAGING_BINDIR_TOOLCHAIN}.${PN}/${TARGET_PREFIX}gcc -print-multi-os-directory`
41 mv ${D}${exec_prefix}/${TARGET_SYS}/lib/$osdir/* ${D}${target_base_libdir}/
41 42
42 # We don't really need this (here shares/ contains man/, info/, locale/). 43 # We don't really need this (here shares/ contains man/, info/, locale/).
43 rm -rf ${D}${datadir}/ 44 rm -rf ${D}${datadir}/