From 8a2aaf8b6bdca2d28c0047093c7f668750d57666 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Thu, 24 Apr 2014 15:24:09 +0100 Subject: gcc-cross-initial: Separate out libgcc-initial Its useful to separate out the native (cross) binaries from the target compilation. We already do this for libgcc, this now takes the same approach for -initial. Signed-off-by: Richard Purdie --- meta/recipes-devtools/gcc/gcc-cross-initial.inc | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) (limited to 'meta/recipes-devtools/gcc/gcc-cross-initial.inc') diff --git a/meta/recipes-devtools/gcc/gcc-cross-initial.inc b/meta/recipes-devtools/gcc/gcc-cross-initial.inc index 81845386f9..3870168863 100644 --- a/meta/recipes-devtools/gcc/gcc-cross-initial.inc +++ b/meta/recipes-devtools/gcc/gcc-cross-initial.inc @@ -38,10 +38,11 @@ do_configure_prepend () { } do_compile () { - oe_runmake all-gcc all-target-libgcc + oe_runmake all-gcc configure-target-libgcc } do_install () { - oe_runmake 'DESTDIR=${D}' install-gcc install-target-libgcc + ( cd ${B}/${TARGET_SYS}/libgcc; oe_runmake 'DESTDIR=${D}' install-unwind_h ) + oe_runmake 'DESTDIR=${D}' install-gcc # We don't really need this (here shares/ contains man/, info/, locale/). rm -rf ${D}${datadir}/ @@ -64,6 +65,14 @@ do_install () { # so we overwirte the generated include-fixed/limits.h for gcc-cross-initial # to get rid references to real limits.h cp gcc/include-fixed/limits.h ${D}${gcclibdir}/${TARGET_SYS}/${BINV}/include-fixed/limits.h + + # gcc-runtime installs libgcc into a special location in staging since it breaks doing a standalone build + case ${PN} in + *gcc-cross-initial|*gcc-crosssdk-initial) + dest=${D}/${includedir}/gcc-build-internal-initial-${MULTIMACH_TARGET_SYS} + hardlinkdir . $dest + ;; + esac } # # Override the default sysroot staging copy since this won't look like a target system -- cgit 1.2.3-korg