diff options
| author | Cliff Brake <cbrake@bec-systems.com> | 2009-02-20 12:05:35 -0500 |
|---|---|---|
| committer | Cliff Brake <cbrake@bec-systems.com> | 2009-02-20 12:05:35 -0500 |
| commit | ab066eb3b73656186a445667aa4f8c46b48644b3 (patch) | |
| tree | d3b964b9c48ef1a6fce2d48534d1a8367df40768 /packages/gcc/gcc-configure-canadian-sdk.inc | |
| parent | d512927cbf42dc9a3302ecac790a18d397ea012f (diff) | |
| parent | b8215aff2a8d11d99368d7794785b08a6fc0ed4c (diff) | |
Merge branch 'org.openembedded.dev' of git@git.openembedded.net:openembedded into org.openembedded.dev
Diffstat (limited to 'packages/gcc/gcc-configure-canadian-sdk.inc')
| -rw-r--r-- | packages/gcc/gcc-configure-canadian-sdk.inc | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/packages/gcc/gcc-configure-canadian-sdk.inc b/packages/gcc/gcc-configure-canadian-sdk.inc index 489cb46371..c95a6c41df 100644 --- a/packages/gcc/gcc-configure-canadian-sdk.inc +++ b/packages/gcc/gcc-configure-canadian-sdk.inc @@ -3,7 +3,10 @@ require gcc-configure-common.inc USE_NLS = '${@base_conditional( "TARGET_OS", "linux-uclibc", "no", "", d )}' USE_NLS = '${@base_conditional( "TARGET_OS", "linux-uclibcgnueabi", "no", "", d )}' -ARCH_FLAGS_FOR_TARGET="" +# +# We need to override this and make sure the compiler can find staging +# +export ARCH_FLAGS_FOR_TARGET = "--sysroot=${STAGING_DIR_TARGET}" # Tools for build export CC_FOR_BUILD="${BUILD_CC}" @@ -57,22 +60,16 @@ export WINDRES_FOR_TARGET="${TARGET_PREFIX}windres" EXTRA_OECONF_DEP ?= "" -SYSROOT = "${WORKDIR}/sysroot" EXTRA_OECONF += "" EXTRA_OECONF_PATHS = " \ --with-local-prefix=$dollar{prefix}/local \ --with-gxx-include-dir=$dollar{prefix}/${TARGET_SYS}/usr/include/c++/${BINV} \ - --with-build-sysroot=${SYSROOT} \ + --with-build-sysroot=${STAGING_DIR_TARGET} \ --with-sysroot=${SDK_REALPATH}/${TARGET_SYS} \ " do_configure () { # Work around Hardcoded path assumptions in gcc - mkdir -p ${SYSROOT}/usr - ln -sf ${STAGING_DIR_HOST}${layout_includedir} \ - ${SYSROOT}/usr/include - ln -sf ${STAGING_DIR_HOST}${layout_libdir} \ - ${SYSROOT}/usr/lib (cd ${S} && gnu-configize) || die "failure running gnu-configize" (cd ${S}/libstdc++-v3 && autoreconf) canadian_sdk_runconf |