gcc-cross-intermediate.inc: Move libgcc from cross dir to target sysroot
authorKhem Raj <raj.khem@gmail.com>
Fri, 15 Oct 2010 06:40:37 +0000 (23:40 -0700)
committerKhem Raj <raj.khem@gmail.com>
Fri, 15 Oct 2010 20:54:54 +0000 (13:54 -0700)
shared version of libgcc is also installed by gcc-cross-intermediate
which we did not move to staging as a result cross gcc found this libgcc
and used it compailing about missing libc.so stuff.

Signed-off-by: Khem Raj <raj.khem@gmail.com>
recipes/gcc/gcc-cross-intermediate.inc

index 6dbdb94..2b6b24f 100644 (file)
@@ -18,8 +18,16 @@ EXTRA_OECONF = "--with-local-prefix=${STAGING_DIR_TARGET}${target_prefix} \
                ${@get_gcc_mips_plt_setting(bb, d)}"
 
 do_install () {
-       oe_runmake 'DESTDIR=${D}' install
+        oe_runmake 'DESTDIR=${D}' install
+        install -d ${D}${target_base_libdir}
+        install -d ${D}${target_libdir}
 
+        for d in ${TARGET_SYS}/lib/nof ${TARGET_SYS}/lib64 ${TARGET_SYS}/lib; do
+                if [ -d ${D}${prefix}/$d/ ]; then
+                        mv -f ${D}${prefix}/$d/libgcc* ${D}${target_base_libdir} || true
+                        mv -f ${D}${prefix}/$d/* ${D}${target_libdir} || true
+                fi
+        done
     # If this is important, we should remove the staging package here
        # get rid of dummy libc.so
        #if [ -z "`file ${STAGING_DIR_TARGET}${target_libdir}/libc.so | grep "ASCII C program text"`" ]; then