[oe-commits] Tom Rini : sane-toolchain.inc and local.conf.sample: Update CSL bits
git version control
git at git.openembedded.org
Wed Apr 6 18:15:32 UTC 2011
Module: openembedded.git
Branch: master
Commit: 1505b3c5f5cd5be6eabc71fce4af71e7b11b0f7e
URL: http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=1505b3c5f5cd5be6eabc71fce4af71e7b11b0f7e
Author: Tom Rini <tom_rini at mentor.com>
Date: Wed Apr 6 11:13:33 2011 -0700
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 at mentor.com>
---
conf/distro/include/sane-toolchain.inc | 4 ----
conf/local.conf.sample | 3 ++-
2 files changed, 2 insertions(+), 5 deletions(-)
diff --git a/conf/distro/include/sane-toolchain.inc b/conf/distro/include/sane-toolchain.inc
index a174a07..7d945ec 100644
--- a/conf/distro/include/sane-toolchain.inc
+++ b/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:
diff --git a/conf/local.conf.sample b/conf/local.conf.sample
index 4a27130..857ede9 100644
--- a/conf/local.conf.sample
+++ b/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"
More information about the Openembedded-commits
mailing list