From f47eeddbd692ac3c6109c18c9f04a3ad4dc789ba Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Tue, 8 Jun 2010 20:33:16 +0100 Subject: gcc-runtime: Various bug fixes * Use the -nostdinc++ to CXX fixing libstdc++ * Generate libgcc in gcc-cross, save the result and use in gcc-runtime * Fix the layout of the crt*.o files so the SDK compiler can find them Signed-off-by: Richard Purdie --- meta/packages/gcc/gcc-configure-runtime.inc | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'meta/packages/gcc/gcc-configure-runtime.inc') diff --git a/meta/packages/gcc/gcc-configure-runtime.inc b/meta/packages/gcc/gcc-configure-runtime.inc index 7b43aabf9..180ca8d0e 100644 --- a/meta/packages/gcc/gcc-configure-runtime.inc +++ b/meta/packages/gcc/gcc-configure-runtime.inc @@ -6,20 +6,20 @@ EXTRA_OECONF_PATHS = " \ --with-sysroot=${STAGING_DIR_TARGET} \ --with-build-sysroot=${STAGING_DIR_TARGET}" -RUNTIMETARGET = "libgcc libssp libstdc++-v3" +RUNTIMETARGET = "libssp libstdc++-v3" # ? # libiberty # libmudflap # libgfortran do_configure () { - cp ${STAGING_DIR_NATIVE}${prefix_native}/include/gcc-build-internal-${TARGET_SYS}/* ${S}/gcc + export CXX="${CXX} -nostdinc++" for d in ${RUNTIMETARGET}; do echo "Configuring $d" mkdir -p ${B}/$d/ cd ${B}/$d/ chmod a+x ${S}/$d/configure - ${S}/$d/configure ${CONFIGUREOPTS} ${EXTRA_OECONF_PATHS} + ${S}/$d/configure ${CONFIGUREOPTS} ${EXTRA_OECONF} done } @@ -31,6 +31,10 @@ do_compile () { } do_install () { + # Install libgcc from our gcc-cross saved data + install -d ${D}${base_libdir} ${D}${libdir} + cp -fpPR ${STAGING_INCDIR_NATIVE}/gcc-build-internal-${TARGET_SYS}/* ${D} + for d in ${RUNTIMETARGET}; do cd ${B}/$d/ oe_runmake 'DESTDIR=${D}' install -- cgit v1.2.3