Skip to content
Browse files

sane-toolchain.inc and local.conf.sample: Update CSL bits

What we need to do in certain cases (ia32 for example) is to
override TARGET_PREFIX to cope with the toolchain name we have
rather than possibly muck with TARGET_OS and cause other tests
to fail.

Signed-off-by: Tom Rini <tom_rini@mentor.com>
  • Loading branch information...
1 parent 34f638c commit 1505b3c5f5cd5be6eabc71fce4af71e7b11b0f7e Tom Rini committed
Showing with 2 additions and 5 deletions.
  1. +0 −4 conf/distro/include/sane-toolchain.inc
  2. +2 −1 conf/local.conf.sample
View
4 conf/distro/include/sane-toolchain.inc
@@ -200,10 +200,6 @@ def compute_os_portion_of_target_triplet (d):
bb.note("DISTRO_FEATURES is not set abi suffix not set")
abi_suffix = ""
- if bb.data.getVar('TOOLCHAIN_BRAND', d, 1) is not None and \
- "csl" in bb.data.getVar('TOOLCHAIN_BRAND', d, 1):
- gnu_suffix = "gnu"
-
if libc_suffix + gnu_suffix + abi_suffix is not "":
return os_suffix + "-" + libc_suffix + gnu_suffix + abi_suffix
else:
View
3 conf/local.conf.sample
@@ -94,7 +94,8 @@ PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}g++:gcc-cross"
# binary toolchain, in this case one built by CodeSourcery. The following
# example is for ARM and we set TOOLCHAIN_VENDOR to "-none" as the CodeSourcery
# ARM tools are arm-none-linux-gnueabi-$tool. Other arches need different
-# values here. This assumes that the tools are already in the users PATH.
+# values here. Some arches may need to override TARGET_PREFIX (ia32).
+# This assumes that the tools are already in the users PATH.
# TOOLCHAIN_VENDOR = "-none"
# TOOLCHAIN_TYPE = "external"
# TOOLCHAIN_BRAND = "csl"

0 comments on commit 1505b3c

Please sign in to comment.
Something went wrong with that request. Please try again.