diff options
| author | Richard Purdie <richard@openedhand.com> | 2007-11-12 11:06:34 +0000 |
|---|---|---|
| committer | Richard Purdie <richard@openedhand.com> | 2007-11-12 11:06:34 +0000 |
| commit | 0e09147de182aeb96cff9ff59211b3d907ba83f7 (patch) | |
| tree | 004da019bcbfcd9e2325f1855877eca18fc56587 /meta/packages/gcc | |
| parent | 19f1bad37806b5e0b4d971d09226eda51345c9d2 (diff) | |
| download | openembedded-core-0e09147de182aeb96cff9ff59211b3d907ba83f7.tar.gz openembedded-core-0e09147de182aeb96cff9ff59211b3d907ba83f7.tar.bz2 openembedded-core-0e09147de182aeb96cff9ff59211b3d907ba83f7.tar.xz openembedded-core-0e09147de182aeb96cff9ff59211b3d907ba83f7.zip | |
Remove hardcoded staging layout assumptions
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@3116 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat (limited to 'meta/packages/gcc')
| -rw-r--r-- | meta/packages/gcc/gcc-cross-initial.inc | 2 | ||||
| -rw-r--r-- | meta/packages/gcc/gcc4-build-sdk.inc | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/meta/packages/gcc/gcc-cross-initial.inc b/meta/packages/gcc/gcc-cross-initial.inc index 7c56afece..2165bf22c 100644 --- a/meta/packages/gcc/gcc-cross-initial.inc +++ b/meta/packages/gcc/gcc-cross-initial.inc @@ -4,7 +4,7 @@ PROVIDES = "virtual/${TARGET_PREFIX}gcc-initial" PACKAGES = "" # This is intended to be a -very- basic config -EXTRA_OECONF = "--with-local-prefix=${STAGING_DIR}/${TARGET_SYS} \ +EXTRA_OECONF = "--with-local-prefix=${STAGING_DIR_TARGET}${layout_prefix} \ --with-newlib \ --disable-shared \ --disable-threads \ diff --git a/meta/packages/gcc/gcc4-build-sdk.inc b/meta/packages/gcc/gcc4-build-sdk.inc index 77d326b3e..1fcd1e80d 100644 --- a/meta/packages/gcc/gcc4-build-sdk.inc +++ b/meta/packages/gcc/gcc4-build-sdk.inc @@ -7,8 +7,8 @@ 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 + ln -s ${STAGING_DIR_TARGET}${layout_includedir} ${SYSROOT}/usr/include + ln -s ${STAGING_DIR_TARGET}${layout_libdir} ${SYSROOT}/usr/lib (cd ${S} && gnu-configize) || die "failure running gnu-configize" (cd ${S}/libstdc++-v3 && autoreconf) oe_runconf |