summaryrefslogtreecommitdiff
path: root/meta/conf/distro
diff options
context:
space:
mode:
authorRichard Purdie <richard@openedhand.com>2008-07-24 20:30:37 +0000
committerRichard Purdie <richard@openedhand.com>2008-07-24 20:30:37 +0000
commit87796f6ce02df30375057fac934685d109f99be3 (patch)
tree419fb9887ca981ada36fc0071c8078f35d4f82f2 /meta/conf/distro
parentf9651fac68352c9cfa6c616ae50f711c32e7bf32 (diff)
downloadopenembedded-core-87796f6ce02df30375057fac934685d109f99be3.tar.gz
openembedded-core-87796f6ce02df30375057fac934685d109f99be3.tar.bz2
openembedded-core-87796f6ce02df30375057fac934685d109f99be3.tar.xz
openembedded-core-87796f6ce02df30375057fac934685d109f99be3.zip
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/distro')
-rw-r--r--meta/conf/distro/include/poky-eabi.inc5
-rw-r--r--meta/conf/distro/include/poky-uclibc.inc1
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 7787e3de7..cf2f336de 100644
--- a/meta/conf/distro/include/poky-eabi.inc
+++ b/meta/conf/distro/include/poky-eabi.inc
@@ -6,9 +6,10 @@
TARGET_VENDOR = "-poky"
-PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}libc-for-gcc = "glibc-intermediate"
+PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}libc-for-gcc = "glibc"
PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}binutils = "binutils-cross"
PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}gcc-initial = "gcc-cross-initial"
+PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}gcc-intermediate = "gcc-cross-intermediate"
PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}gcc = "gcc-cross"
PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}g++ = "gcc-cross"
@@ -24,10 +25,10 @@ BINUVERSION = "2.18"
PREFERRED_VERSION_gcc ?= "${GCCVERSION}"
PREFERRED_VERSION_gcc-cross ?= "${GCCVERSION}"
PREFERRED_VERSION_gcc-cross-initial ?= "${GCCVERSION}"
+PREFERRED_VERSION_gcc-cross-intermediate ?= "${GCCVERSION}"
PREFERRED_VERSION_binutils ?= "${BINUVERSION}"
PREFERRED_VERSION_binutils-cross ?= "${BINUVERSION}"
PREFERRED_VERSION_linux-libc-headers ?= "2.6.24"
PREFERRED_VERSION_glibc ?= "2.6.1"
-PREFERRED_VERSION_glibc-intermediate ?= "2.6.1"
PREFERRED_VERSION_glibc-initial ?= "2.6.1"
PREFERRED_VERSION_elfutils ?= "0.108"
diff --git a/meta/conf/distro/include/poky-uclibc.inc b/meta/conf/distro/include/poky-uclibc.inc
index fcd65c996..72e016af6 100644
--- a/meta/conf/distro/include/poky-uclibc.inc
+++ b/meta/conf/distro/include/poky-uclibc.inc
@@ -3,6 +3,7 @@
#
PREFERRED_PROVIDER_virtual/libc = "uclibc"
+PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}libc-for-gcc = "uclibc"
PREFERRED_PROVIDER_virtual/libiconv ?= "libiconv"
PREFERRED_PROVIDER_virtual/libintl ?= "gettext"