diff options
| author | Florian Boor <florian.boor@kernelconcepts.de> | 2008-03-05 16:11:13 +0000 |
|---|---|---|
| committer | Florian Boor <florian.boor@kernelconcepts.de> | 2008-03-05 16:11:13 +0000 |
| commit | ef531024660d545944a3e4ccf07a757c05895dfe (patch) | |
| tree | 38b34d641b56c98d9330b394b6ae985ffcc82682 /packages/gcc | |
| parent | 0a9efb2c12237765ceabfc2a74d519f2cdabc658 (diff) | |
| parent | 3c03ac44b94421eca51af4b0c783d4720b18c7d7 (diff) | |
merge of '0c8de9825ca55a0e846e8c00dd29764c73349c6f'
and 'a6f0dbe56289aad3373b7ce56ba4e2434e6da244'
Diffstat (limited to 'packages/gcc')
| -rw-r--r-- | packages/gcc/gcc3-build-cross.inc | 5 | ||||
| -rw-r--r-- | packages/gcc/gcc3-build-sdk.inc | 2 | ||||
| -rw-r--r-- | packages/gcc/gcc4-build-sdk.inc | 4 |
3 files changed, 2 insertions, 9 deletions
diff --git a/packages/gcc/gcc3-build-cross.inc b/packages/gcc/gcc3-build-cross.inc index 1d744c1eae..33429e18ef 100644 --- a/packages/gcc/gcc3-build-cross.inc +++ b/packages/gcc/gcc3-build-cross.inc @@ -23,11 +23,6 @@ do_stage_append () { rm -rf ${CROSS_DIR}/$d done - # Hack to be removed when staging layout matches the target layout - if [ ! -e ${STAGING_DIR_TARGET}/usr ]; then - ln -s ${STAGING_DIR_TARGET} ${STAGING_DIR_TARGET}/usr - fi - # Fix a few include links so cross builds are happier if [ ! -e ${STAGING_INCDIR}/c++ ]; then mkdir -p ${STAGING_INCDIR} diff --git a/packages/gcc/gcc3-build-sdk.inc b/packages/gcc/gcc3-build-sdk.inc index aa540212c4..5bc187b745 100644 --- a/packages/gcc/gcc3-build-sdk.inc +++ b/packages/gcc/gcc3-build-sdk.inc @@ -5,6 +5,8 @@ SRC_URI += 'file://sdk-libstdc++-includes.patch;patch=1' STAGING_TARGET_INCDIR = "${STAGING_DIR_TARGET}${layout_includedir}" STAGING_TARGET_LIBDIR = "${STAGING_DIR_TARGET}${layout_libdir}" +EXTRA_OECONF += "--with-sysroot=${prefix}/${TARGET_SYS} --with-build-sysroot=${STAGING_DIR_TARGET}" + do_configure () { (cd ${S} && gnu-configize) || die "failure running gnu-configize" (cd ${S}/libstdc++-v3 && autoreconf) diff --git a/packages/gcc/gcc4-build-sdk.inc b/packages/gcc/gcc4-build-sdk.inc index 10526454c3..d6af5fe933 100644 --- a/packages/gcc/gcc4-build-sdk.inc +++ b/packages/gcc/gcc4-build-sdk.inc @@ -4,10 +4,6 @@ USE_NLS = '${@base_conditional( "TARGET_OS", "linux-uclibcgnueabi", "no", "", d EXTRA_OECONF += "--with-sysroot=${prefix}/${TARGET_SYS} --with-build-sysroot=${STAGING_DIR_TARGET}" do_configure () { - # Hack to be removed when staging layout matches the target layout - if [ ! -e ${STAGING_DIR_TARGET}/usr ]; then - ln -s ${STAGING_DIR_TARGET} ${STAGING_DIR_TARGET}/usr - fi (cd ${S} && gnu-configize) || die "failure running gnu-configize" (cd ${S}/libstdc++-v3 && autoreconf) oe_runconf |