summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard@openedhand.com>2007-09-19 13:01:18 +0000
committerRichard Purdie <richard@openedhand.com>2007-09-19 13:01:18 +0000
commit405a6a68a644bdbdf303bca95d24e668efcfd2e5 (patch)
tree8b0b6857b3dc82d19939c4f1096be89ad1cbfaa8
parent6d09e07cd2778089845c7a5235da6d4c5a244070 (diff)
downloadpoky-405a6a68a644bdbdf303bca95d24e668efcfd2e5.tar.gz
gcc-cross: Use staging for local-prefix instead of cross, undo ARCH_FLAGS_FOR_TARGET change
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@2763 311d38ba-8fff-0310-9ca6-ca027cbcb966
-rw-r--r--meta/packages/gcc/gcc-cross-initial.inc2
-rw-r--r--meta/packages/gcc/gcc3-build-cross.inc4
-rw-r--r--meta/packages/gcc/gcc3-build.inc6
3 files changed, 6 insertions, 6 deletions
diff --git a/meta/packages/gcc/gcc-cross-initial.inc b/meta/packages/gcc/gcc-cross-initial.inc
index 49e1937b06..7c56afecef 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"
4PACKAGES = "" 4PACKAGES = ""
5 5
6# This is intended to be a -very- basic config 6# This is intended to be a -very- basic config
7EXTRA_OECONF = "--with-local-prefix=${CROSS_DIR}/${TARGET_SYS} \ 7EXTRA_OECONF = "--with-local-prefix=${STAGING_DIR}/${TARGET_SYS} \
8 --with-newlib \ 8 --with-newlib \
9 --disable-shared \ 9 --disable-shared \
10 --disable-threads \ 10 --disable-threads \
diff --git a/meta/packages/gcc/gcc3-build-cross.inc b/meta/packages/gcc/gcc3-build-cross.inc
index 94aa1f4e9a..ec285f522b 100644
--- a/meta/packages/gcc/gcc3-build-cross.inc
+++ b/meta/packages/gcc/gcc3-build-cross.inc
@@ -1,7 +1,7 @@
1USE_NLS = '${@base_conditional( "TARGET_OS", "linux-uclibc", "no", "", d )}' 1USE_NLS = '${@base_conditional( "TARGET_OS", "linux-uclibc", "no", "", d )}'
2 2
3EXTRA_OECONF_PATHS = "--with-local-prefix=${CROSS_DIR}/${TARGET_SYS} \ 3EXTRA_OECONF_PATHS = "--with-local-prefix=${STAGING_DIR}/${TARGET_SYS} \
4 --with-gxx-include-dir=${CROSS_DIR}/${TARGET_SYS}/include/c++" 4 --with-gxx-include-dir=${STAGING_DIR}/${TARGET_SYS}/include/c++"
5 5
6do_configure_prepend () { 6do_configure_prepend () {
7 rm -f ${CROSS_DIR}/lib/gcc/${TARGET_SYS}/${BINV}/libgcc_eh.a 7 rm -f ${CROSS_DIR}/lib/gcc/${TARGET_SYS}/${BINV}/libgcc_eh.a
diff --git a/meta/packages/gcc/gcc3-build.inc b/meta/packages/gcc/gcc3-build.inc
index 0ab66addb5..2924f0f9dd 100644
--- a/meta/packages/gcc/gcc3-build.inc
+++ b/meta/packages/gcc/gcc3-build.inc
@@ -47,11 +47,11 @@ CPPFLAGS = ""
47 47
48# Used by configure to define additional values for FLAGS_FOR_TARGET - 48# Used by configure to define additional values for FLAGS_FOR_TARGET -
49# passed to all the compilers. 49# passed to all the compilers.
50ARCH_FLAGS_FOR_TARGET = "-isystem${STAGING_DIR}/${TARGET_SYS}/include" 50ARCH_FLAGS_FOR_TARGET = ""
51#NOTE: not tested on other platforms, the following is probably correct 51#NOTE: not tested on other platforms, the following is probably correct
52# everywhere! 52# everywhere!
53ARCH_FLAGS_FOR_TARGET_slugos = "-isystem${STAGING_DIR}/${TARGET_SYS}/include ${TARGET_CC_ARCH}" 53ARCH_FLAGS_FOR_TARGET_slugos = "${TARGET_CC_ARCH}"
54ARCH_FLAGS_FOR_TARGET_unslung = "-isystem${STAGING_DIR}/${TARGET_SYS}/include ${TARGET_CC_ARCH}" 54ARCH_FLAGS_FOR_TARGET_unslung = "${TARGET_CC_ARCH}"
55EXTRA_OEMAKE += "ARCH_FLAGS_FOR_TARGET='${ARCH_FLAGS_FOR_TARGET}'" 55EXTRA_OEMAKE += "ARCH_FLAGS_FOR_TARGET='${ARCH_FLAGS_FOR_TARGET}'"
56 56
57require gcc-fpu.inc 57require gcc-fpu.inc