diff options
| author | Richard Purdie <richard@openedhand.com> | 2007-09-19 13:01:18 +0000 |
|---|---|---|
| committer | Richard Purdie <richard@openedhand.com> | 2007-09-19 13:01:18 +0000 |
| commit | 405a6a68a644bdbdf303bca95d24e668efcfd2e5 (patch) | |
| tree | 8b0b6857b3dc82d19939c4f1096be89ad1cbfaa8 | |
| parent | 6d09e07cd2778089845c7a5235da6d4c5a244070 (diff) | |
| download | openembedded-core-405a6a68a644bdbdf303bca95d24e668efcfd2e5.tar.gz openembedded-core-405a6a68a644bdbdf303bca95d24e668efcfd2e5.tar.bz2 openembedded-core-405a6a68a644bdbdf303bca95d24e668efcfd2e5.zip | |
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.inc | 2 | ||||
| -rw-r--r-- | meta/packages/gcc/gcc3-build-cross.inc | 4 | ||||
| -rw-r--r-- | meta/packages/gcc/gcc3-build.inc | 6 |
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" PACKAGES = "" # This is intended to be a -very- basic config -EXTRA_OECONF = "--with-local-prefix=${CROSS_DIR}/${TARGET_SYS} \ +EXTRA_OECONF = "--with-local-prefix=${STAGING_DIR}/${TARGET_SYS} \ --with-newlib \ --disable-shared \ --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 @@ USE_NLS = '${@base_conditional( "TARGET_OS", "linux-uclibc", "no", "", d )}' -EXTRA_OECONF_PATHS = "--with-local-prefix=${CROSS_DIR}/${TARGET_SYS} \ - --with-gxx-include-dir=${CROSS_DIR}/${TARGET_SYS}/include/c++" +EXTRA_OECONF_PATHS = "--with-local-prefix=${STAGING_DIR}/${TARGET_SYS} \ + --with-gxx-include-dir=${STAGING_DIR}/${TARGET_SYS}/include/c++" do_configure_prepend () { 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 = "" # Used by configure to define additional values for FLAGS_FOR_TARGET - # passed to all the compilers. -ARCH_FLAGS_FOR_TARGET = "-isystem${STAGING_DIR}/${TARGET_SYS}/include" +ARCH_FLAGS_FOR_TARGET = "" #NOTE: not tested on other platforms, the following is probably correct # everywhere! -ARCH_FLAGS_FOR_TARGET_slugos = "-isystem${STAGING_DIR}/${TARGET_SYS}/include ${TARGET_CC_ARCH}" -ARCH_FLAGS_FOR_TARGET_unslung = "-isystem${STAGING_DIR}/${TARGET_SYS}/include ${TARGET_CC_ARCH}" +ARCH_FLAGS_FOR_TARGET_slugos = "${TARGET_CC_ARCH}" +ARCH_FLAGS_FOR_TARGET_unslung = "${TARGET_CC_ARCH}" EXTRA_OEMAKE += "ARCH_FLAGS_FOR_TARGET='${ARCH_FLAGS_FOR_TARGET}'" require gcc-fpu.inc |