5 files changed, 11 insertions, 13 deletions
diff --git a/packages/gcc/gcc-cross-sdk_3.4.4.bb b/packages/gcc/gcc-cross-sdk_3.4.4.bb
index e6907deb1b..a8e9a67a96 100644
--- a/packages/gcc/gcc-cross-sdk_3.4.4.bb
+++ b/packages/gcc/gcc-cross-sdk_3.4.4.bb
@@ -3,7 +3,7 @@ HOMEPAGE = "http://www.gnu.org/software/gcc/"
 SECTION = "devel"
 LICENSE = "GPL"
 require gcc_${PV}.bb
-PR = "r0"
+PR = "r1"
 
 inherit sdk
 
diff --git a/packages/gcc/gcc-cross-sdk_4.1.0.bb b/packages/gcc/gcc-cross-sdk_4.1.0.bb
index 7233f79504..2308f2f9eb 100644
--- a/packages/gcc/gcc-cross-sdk_4.1.0.bb
+++ b/packages/gcc/gcc-cross-sdk_4.1.0.bb
@@ -3,7 +3,7 @@ HOMEPAGE = "http://www.gnu.org/software/gcc/"
 SECTION = "devel"
 LICENSE = "GPL"
 require gcc_${PV}.bb
-PR = "r0"
+PR = "r1"
 
 inherit sdk
 
diff --git a/packages/gcc/gcc-cross-sdk_4.1.1.bb b/packages/gcc/gcc-cross-sdk_4.1.1.bb
index e3050d3926..51470c7214 100644
--- a/packages/gcc/gcc-cross-sdk_4.1.1.bb
+++ b/packages/gcc/gcc-cross-sdk_4.1.1.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "The GNU cc and gcc C compilers."
 HOMEPAGE = "http://www.gnu.org/software/gcc/"
 SECTION = "devel"
 LICENSE = "GPL"
-PR = "r0"
+PR = "r1"
 
 inherit sdk
 
diff --git a/packages/gcc/gcc-cross-sdk_4.1.2.bb b/packages/gcc/gcc-cross-sdk_4.1.2.bb
index 5bfb454452..6964199f17 100644
--- a/packages/gcc/gcc-cross-sdk_4.1.2.bb
+++ b/packages/gcc/gcc-cross-sdk_4.1.2.bb
@@ -1,4 +1,4 @@
-PR = "r3"
+PR = "r4"
 
 inherit sdk
 
diff --git a/packages/gcc/gcc4-build-sdk.inc b/packages/gcc/gcc4-build-sdk.inc
index b75e8a57c9..77d326b3ee 100644
--- a/packages/gcc/gcc4-build-sdk.inc
+++ b/packages/gcc/gcc4-build-sdk.inc
@@ -1,19 +1,17 @@
 USE_NLS = '${@base_conditional( "TARGET_OS", "linux-uclibc", "no", "", d )}'
 USE_NLS = '${@base_conditional( "TARGET_OS", "linux-uclibcgnueabi", "no", "", d )}'
 
-
-STAGING_TARGET_INCDIR = "${STAGING_DIR}/${TARGET_SYS}/include"
-STAGING_TARGET_LIBDIR = "${STAGING_DIR}/${TARGET_SYS}/lib"
+SYSROOT = "${WORKDIR}/sysroot"
+EXTRA_OECONF += "--with-sysroot=${SYSROOT}"
 
 do_configure () {
+       # Work around Hardcoded path assumptions in gcc
+       mkdir -p ${SYSROOT}/usr/
+       ln -s ${STAGING_DIR}/${TARGET_SYS}/include ${SYSROOT}/usr/include
+       ln -s ${STAGING_DIR}/${TARGET_SYS}/lib ${SYSROOT}/usr/lib
        (cd ${S} && gnu-configize) || die "failure running gnu-configize"
        (cd ${S}/libstdc++-v3 && autoreconf)
        oe_runconf
-       mkdir -p gcc
-       ln -sf ${CROSS_DIR}/bin/${TARGET_PREFIX}as gcc/as
-       ln -sf ${CROSS_DIR}/bin/${TARGET_PREFIX}ld gcc/ld
-       ln -sf ${STAGING_TARGET_INCDIR}/* ${S}/include
-       ln -sf ${STAGING_TARGET_LIBDIR}/crt*.o gcc/
 }
 
 do_compile () {
@@ -23,5 +21,5 @@ do_compile () {
 	export LD_FOR_TARGET="${TARGET_SYS}-ld"
 	export NM_FOR_TARGET="${TARGET_SYS}-nm"
 	export CC_FOR_TARGET="${CCACHE} ${TARGET_SYS}-gcc ${TARGET_CC_ARCH}"
-	oe_runmake CFLAGS_FOR_TARGET="-I${STAGING_TARGET_INCDIR}"
+	oe_runmake
 }