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 | poky-0e09147de182aeb96cff9ff59211b3d907ba83f7.tar.gz |
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 7c56afecef..2165bf22ce 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" | |||
4 | PACKAGES = "" | 4 | PACKAGES = "" |
5 | 5 | ||
6 | # This is intended to be a -very- basic config | 6 | # This is intended to be a -very- basic config |
7 | EXTRA_OECONF = "--with-local-prefix=${STAGING_DIR}/${TARGET_SYS} \ | 7 | EXTRA_OECONF = "--with-local-prefix=${STAGING_DIR_TARGET}${layout_prefix} \ |
8 | --with-newlib \ | 8 | --with-newlib \ |
9 | --disable-shared \ | 9 | --disable-shared \ |
10 | --disable-threads \ | 10 | --disable-threads \ |
diff --git a/meta/packages/gcc/gcc4-build-sdk.inc b/meta/packages/gcc/gcc4-build-sdk.inc index 77d326b3ee..1fcd1e80d0 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}" | |||
7 | do_configure () { | 7 | do_configure () { |
8 | # Work around Hardcoded path assumptions in gcc | 8 | # Work around Hardcoded path assumptions in gcc |
9 | mkdir -p ${SYSROOT}/usr/ | 9 | mkdir -p ${SYSROOT}/usr/ |
10 | ln -s ${STAGING_DIR}/${TARGET_SYS}/include ${SYSROOT}/usr/include | 10 | ln -s ${STAGING_DIR_TARGET}${layout_includedir} ${SYSROOT}/usr/include |
11 | ln -s ${STAGING_DIR}/${TARGET_SYS}/lib ${SYSROOT}/usr/lib | 11 | ln -s ${STAGING_DIR_TARGET}${layout_libdir} ${SYSROOT}/usr/lib |
12 | (cd ${S} && gnu-configize) || die "failure running gnu-configize" | 12 | (cd ${S} && gnu-configize) || die "failure running gnu-configize" |
13 | (cd ${S}/libstdc++-v3 && autoreconf) | 13 | (cd ${S}/libstdc++-v3 && autoreconf) |
14 | oe_runconf | 14 | oe_runconf |