Rearrange staging to match target system layout. This is a major change and will require a full rebuild.

git-svn-id: https://svn.o-hand.com/repos/poky/trunk@3123 311d38ba-8fff-0310-9ca6-ca027cbcb966

1 files changed, 4 insertions, 9 deletions

diff --git a/meta/packages/gcc/gcc3-build-cross.inc b/meta/packages/gcc/gcc3-build-cross.inc
index ec285f522b..2b9766975c 100644
--- a/meta/packages/gcc/gcc3-build-cross.inc
+++ b/meta/packages/gcc/gcc3-build-cross.inc
@@ -1,7 +1,9 @@
 USE_NLS = '${@base_conditional( "TARGET_OS", "linux-uclibc", "no", "", d )}'
 
-EXTRA_OECONF_PATHS = "--with-local-prefix=${STAGING_DIR}/${TARGET_SYS} \
-                      --with-gxx-include-dir=${STAGING_DIR}/${TARGET_SYS}/include/c++"
+EXTRA_OECONF_PATHS = "--with-local-prefix=${STAGING_DIR_TARGET}${layout_prefix} \
+                      --with-gxx-include-dir=${STAGING_DIR_TARGET}/${layout_includedir}/c++ \
+                      --with-sysroot=${STAGING_DIR_TARGET} \
+                      --with-build-sysroot=${STAGING_DIR_TARGET}"
 
 do_configure_prepend () {
         rm -f ${CROSS_DIR}/lib/gcc/${TARGET_SYS}/${BINV}/libgcc_eh.a
@@ -25,13 +27,6 @@ do_stage_append () {
         rm -f ${CROSS_DIR}/bin/*gcov
         rm -f ${CROSS_DIR}/bin/*gccbug
 
-        # Fix a few include links so cross builds are happier
-        if [ ! -e ${STAGING_INCDIR}/c++ ]; then
-                mkdir -p ${STAGING_INCDIR}
-                ln -sf ${CROSS_DIR}/${TARGET_SYS}/include/c++ \
-                        ${STAGING_INCDIR}/
-        fi
-
         # We use libiberty from binutils
         rm -f ${CROSS_DIR}/lib/libiberty.a