diff options
| author |   Tom Rini <tom_rini@mentor.com> | 2011-04-06 11:13:33 -0700 |
|---|---|---|
| committer | Tom Rini <tom_rini@mentor.com> | 2011-04-06 11:15:05 -0700 |
| commit | 1505b3c5f5cd5be6eabc71fce4af71e7b11b0f7e (patch) | |
| tree | 4184dd55b7c2196e48feb35d3b5eac67e0866010 /conf | |
| parent | 34f638c9280318f889475a7e71e7d5e9e78a41ac (diff) | |
| download | openembedded-1505b3c5f5cd5be6eabc71fce4af71e7b11b0f7e.tar.gz | |
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>
Diffstat (limited to 'conf')
| -rw-r--r-- | conf/distro/include/sane-toolchain.inc | 4 | ||||
| -rw-r--r-- | 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 a174a070fd..7d945ec4f3 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 4a27130d3a..857ede9119 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" |