From d6f7133b8d8e67069233aba56937fa4c6e41d196 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Thu, 28 Feb 2008 00:04:07 +0000 Subject: gcc: Enable sysroot options, hacking around path layout issues for now. This fixes the sdk version to use the correct sysroot which is important for ease of use of SDKs and standalone toolchains. This change means a gcc rebuild unfortunately --- packages/gcc/gcc4-build-sdk.inc | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) (limited to 'packages/gcc/gcc4-build-sdk.inc') diff --git a/packages/gcc/gcc4-build-sdk.inc b/packages/gcc/gcc4-build-sdk.inc index 77d326b3ee..10526454c3 100644 --- a/packages/gcc/gcc4-build-sdk.inc +++ b/packages/gcc/gcc4-build-sdk.inc @@ -1,14 +1,13 @@ USE_NLS = '${@base_conditional( "TARGET_OS", "linux-uclibc", "no", "", d )}' USE_NLS = '${@base_conditional( "TARGET_OS", "linux-uclibcgnueabi", "no", "", d )}' -SYSROOT = "${WORKDIR}/sysroot" -EXTRA_OECONF += "--with-sysroot=${SYSROOT}" +EXTRA_OECONF += "--with-sysroot=${prefix}/${TARGET_SYS} --with-build-sysroot=${STAGING_DIR_TARGET}" 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 + # 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 -- cgit v1.2.3