[oe-commits] Phil Blundell : keep in step with PN

[git version control]

Module: openembedded.git
Branch: pb/toolchain-desuck
Commit: ded930e0ed9efa4ae1a11b3112f4a2c7a43fc011
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=ded930e0ed9efa4ae1a11b3112f4a2c7a43fc011

Author: Phil Blundell <philb at gnu.org>
Date:   Mon Feb  8 16:30:20 2010 +0000

keep in step with PN

---

 conf/distro/include/sane-toolchain-uclibc.inc |    1 -
 conf/distro/include/sane-toolchain.inc        |   26 ++++++++++++------------
 conf/distro/include/toolchain-internal.inc    |   10 ++++----
 3 files changed, 18 insertions(+), 19 deletions(-)

diff --git a/conf/distro/include/sane-toolchain-uclibc.inc b/conf/distro/include/sane-toolchain-uclibc.inc
index 3069820..ac7dde0 100644
--- a/conf/distro/include/sane-toolchain-uclibc.inc
+++ b/conf/distro/include/sane-toolchain-uclibc.inc
@@ -2,7 +2,6 @@
 
 # uclibc:
 
-PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}binutils = "binutils-cross"
 PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}libc-for-gcc = "uclibc"
 PREFERRED_PROVIDER_linux-libc-headers = "linux-libc-headers"
 PREFERRED_PROVIDER_virtual/libc         = "uclibc"
diff --git a/conf/distro/include/sane-toolchain.inc b/conf/distro/include/sane-toolchain.inc
index daa2def..5aedb64 100644
--- a/conf/distro/include/sane-toolchain.inc
+++ b/conf/distro/include/sane-toolchain.inc
@@ -33,27 +33,27 @@ PREFERRED_VERSION_linux-libc-headers ?= "2.6.31"
 
 # Binutils
 PREFERRED_VERSION_binutils           ?= "${PREFERRED_BINUTILS}"
-PREFERRED_VERSION_binutils-cross     ?= "${PREFERRED_BINUTILS}"
-PREFERRED_VERSION_binutils-cross-sdk ?= "${PREFERRED_BINUTILS}"
+PREFERRED_VERSION_binutils-cross-${TARGET_SYS}     ?= "${PREFERRED_BINUTILS}"
+PREFERRED_VERSION_binutils-cross-sdk-${TARGET_SYS} ?= "${PREFERRED_BINUTILS}"
 
 # Avr32 only has patches for binutils 2.17 in OE
 PREFERRED_VERSION_binutils_avr32 =           "2.17"
-PREFERRED_VERSION_binutils-cross_avr32 =     "2.17"
-PREFERRED_VERSION_binutils-cross-sdk_avr32 = "2.17"
+PREFERRED_VERSION_binutils-cross-${TARGET_SYS}_avr32 =     "2.17"
+PREFERRED_VERSION_binutils-cross-sdk-${TARGET_SYS}_avr32 = "2.17"
 
 # Compiler versions
 PREFERRED_VERSION_gcc                    ?= "${PREFERRED_GCC_VERSION}"
-PREFERRED_VERSION_gcc-cross              ?= "${PREFERRED_GCC_VERSION}"
-PREFERRED_VERSION_gcc-cross-sdk          ?= "${PREFERRED_GCC_VERSION}"
-PREFERRED_VERSION_gcc-cross-initial      ?= "${PREFERRED_GCC_VERSION}"
-PREFERRED_VERSION_gcc-cross-intermediate ?= "${PREFERRED_GCC_VERSION}"
+PREFERRED_VERSION_gcc-cross-${TARGET_SYS}              ?= "${PREFERRED_GCC_VERSION}"
+PREFERRED_VERSION_gcc-cross-sdk-${TARGET_SYS}          ?= "${PREFERRED_GCC_VERSION}"
+PREFERRED_VERSION_gcc-cross-initial-${TARGET_SYS}      ?= "${PREFERRED_GCC_VERSION}"
+PREFERRED_VERSION_gcc-cross-intermediate-${TARGET_SYS} ?= "${PREFERRED_GCC_VERSION}"
 
 # Compiler selection
-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"
+PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}binutils         = "binutils-cross-${TARGET_SYS}"
+PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}gcc-initial      = "gcc-cross-initial-${TARGET_SYS}"
+PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}gcc-intermediate = "gcc-cross-intermediate-${TARGET_SYS}"
+PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}gcc              = "gcc-cross-${TARGET_SYS}"
+PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}g++              = "gcc-cross-${TARGET_SYS}"
 
 # Others
 PREFERRED_PROVIDER_linux-libc-headers = "linux-libc-headers"
diff --git a/conf/distro/include/toolchain-internal.inc b/conf/distro/include/toolchain-internal.inc
index 71c6280..4d53538 100644
--- a/conf/distro/include/toolchain-internal.inc
+++ b/conf/distro/include/toolchain-internal.inc
@@ -1,6 +1,6 @@
 # Toolchain specific virtuals
-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"
+PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}binutils = "binutils-cross-${TARGET_SYS}"
+PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}gcc-initial = "gcc-cross-initial-${TARGET_SYS}"
+PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}gcc-intermediate = "gcc-cross-intermediate-${TARGET_SYS}"
+PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}gcc = "gcc-cross-${TARGET_SYS}"
+PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}g++ = "gcc-cross-${TARGET_SYS}"