diff options
| author | Richard Purdie <richard@openedhand.com> | 2008-07-24 20:30:37 +0000 |
|---|---|---|
| committer | Richard Purdie <richard@openedhand.com> | 2008-07-24 20:30:37 +0000 |
| commit | 87796f6ce02df30375057fac934685d109f99be3 (patch) | |
| tree | 419fb9887ca981ada36fc0071c8078f35d4f82f2 /meta/conf | |
| parent | f9651fac68352c9cfa6c616ae50f711c32e7bf32 (diff) | |
| download | poky-87796f6ce02df30375057fac934685d109f99be3.tar.gz | |
gcc: Add toolchain build process changes from OE which adds gcc-cross-intermediate and removes glibc-intermediate based on a patch from Khem Raj as will be aplied to OE.dev making the build process much more rebust/stable/correct.
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@4943 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat (limited to 'meta/conf')
| -rw-r--r-- | meta/conf/distro/include/poky-eabi.inc | 5 | ||||
| -rw-r--r-- | meta/conf/distro/include/poky-uclibc.inc | 1 |
2 files changed, 4 insertions, 2 deletions
diff --git a/meta/conf/distro/include/poky-eabi.inc b/meta/conf/distro/include/poky-eabi.inc index 7787e3de7d..cf2f336de1 100644 --- a/meta/conf/distro/include/poky-eabi.inc +++ b/meta/conf/distro/include/poky-eabi.inc | |||
| @@ -6,9 +6,10 @@ | |||
| 6 | 6 | ||
| 7 | TARGET_VENDOR = "-poky" | 7 | TARGET_VENDOR = "-poky" |
| 8 | 8 | ||
| 9 | PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}libc-for-gcc = "glibc-intermediate" | 9 | PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}libc-for-gcc = "glibc" |
| 10 | PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}binutils = "binutils-cross" | 10 | PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}binutils = "binutils-cross" |
| 11 | PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}gcc-initial = "gcc-cross-initial" | 11 | PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}gcc-initial = "gcc-cross-initial" |
| 12 | PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}gcc-intermediate = "gcc-cross-intermediate" | ||
| 12 | PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}gcc = "gcc-cross" | 13 | PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}gcc = "gcc-cross" |
| 13 | PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}g++ = "gcc-cross" | 14 | PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}g++ = "gcc-cross" |
| 14 | 15 | ||
| @@ -24,10 +25,10 @@ BINUVERSION = "2.18" | |||
| 24 | PREFERRED_VERSION_gcc ?= "${GCCVERSION}" | 25 | PREFERRED_VERSION_gcc ?= "${GCCVERSION}" |
| 25 | PREFERRED_VERSION_gcc-cross ?= "${GCCVERSION}" | 26 | PREFERRED_VERSION_gcc-cross ?= "${GCCVERSION}" |
| 26 | PREFERRED_VERSION_gcc-cross-initial ?= "${GCCVERSION}" | 27 | PREFERRED_VERSION_gcc-cross-initial ?= "${GCCVERSION}" |
| 28 | PREFERRED_VERSION_gcc-cross-intermediate ?= "${GCCVERSION}" | ||
| 27 | PREFERRED_VERSION_binutils ?= "${BINUVERSION}" | 29 | PREFERRED_VERSION_binutils ?= "${BINUVERSION}" |
| 28 | PREFERRED_VERSION_binutils-cross ?= "${BINUVERSION}" | 30 | PREFERRED_VERSION_binutils-cross ?= "${BINUVERSION}" |
| 29 | PREFERRED_VERSION_linux-libc-headers ?= "2.6.24" | 31 | PREFERRED_VERSION_linux-libc-headers ?= "2.6.24" |
| 30 | PREFERRED_VERSION_glibc ?= "2.6.1" | 32 | PREFERRED_VERSION_glibc ?= "2.6.1" |
| 31 | PREFERRED_VERSION_glibc-intermediate ?= "2.6.1" | ||
| 32 | PREFERRED_VERSION_glibc-initial ?= "2.6.1" | 33 | PREFERRED_VERSION_glibc-initial ?= "2.6.1" |
| 33 | PREFERRED_VERSION_elfutils ?= "0.108" | 34 | PREFERRED_VERSION_elfutils ?= "0.108" |
diff --git a/meta/conf/distro/include/poky-uclibc.inc b/meta/conf/distro/include/poky-uclibc.inc index fcd65c9963..72e016af6f 100644 --- a/meta/conf/distro/include/poky-uclibc.inc +++ b/meta/conf/distro/include/poky-uclibc.inc | |||
| @@ -3,6 +3,7 @@ | |||
| 3 | # | 3 | # |
| 4 | 4 | ||
| 5 | PREFERRED_PROVIDER_virtual/libc = "uclibc" | 5 | PREFERRED_PROVIDER_virtual/libc = "uclibc" |
| 6 | PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}libc-for-gcc = "uclibc" | ||
| 6 | PREFERRED_PROVIDER_virtual/libiconv ?= "libiconv" | 7 | PREFERRED_PROVIDER_virtual/libiconv ?= "libiconv" |
| 7 | PREFERRED_PROVIDER_virtual/libintl ?= "gettext" | 8 | PREFERRED_PROVIDER_virtual/libintl ?= "gettext" |
| 8 | 9 | ||