1 files changed, 6 insertions, 7 deletions

diff --git a/meta/conf/distro/include/poky-eabi-csl2005q3-2.inc b/meta/conf/distro/include/poky-eabi-csl2005q3-2.inc
index 535bfd3d81..aaa1163b7f 100644
--- a/meta/conf/distro/include/poky-eabi-csl2005q3-2.inc
+++ b/meta/conf/distro/include/poky-eabi-csl2005q3-2.inc
@@ -1,9 +1,12 @@
 #
-# Poky configuration to use EABI
+# Poky configuration to use CSL 2005q3-2 derived toolchain (ARM EABI)
 #
 
-PREFERRED_PROVIDER_virtual/arm-poky-linux-gnueabi-libc-for-gcc = "glibc-intermediate"
-PREFERRED_PROVIDER_virtual/arm-linux-libc-for-gcc = "glibc-intermediate"
+PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}libc-for-gcc = "glibc-intermediate"
+PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}binutils = "binutils-cross"
+PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}gcc-initial = "gcc-cross-initial"
+PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}gcc = "gcc-cross"
+PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}g++ = "gcc-cross"
 
 PREFERRED_VERSION_gcc ?= "3.4.4+csl-arm-2005q3-2"
 PREFERRED_VERSION_gcc-cross ?= "3.4.4+csl-arm-2005q3-2"
@@ -15,7 +18,3 @@ PREFERRED_VERSION_glibc-intermediate ?= "2.3.6+csl-arm-2005q3-2"
 PREFERRED_VERSION_elfutils ?= "0.108"
 
 PREFERRED_VERSION_linux-libc-headers ?= "2.6.12rc3+csl-arm-2005q3-2"
-
-#Use the ARM EABI when building for an ARM cpu. We can't use overrides
-#here because this breaks all places where ":=" is used.
-TARGET_OS = "linux${@['','-gnueabi'][bb.data.getVar('TARGET_ARCH',d,1)=='arm']}"