Patchwork [1/2] tcmode-external-csl.inc: Allow for overrides

login
register
mail settings
Submitter Peter Seebach
Date May 15, 2012, 6:16 p.m.
Message ID <1e6db593f26c551ae2fa39a3e63ac60e884c06bf.1337105658.git.peter.seebach@windriver.com>
Download mbox | patch
Permalink /patch/27777/
State Accepted
Commit f3c50743917974f0eeab6d9eefc2e7b572a8a787
Headers show

Comments

Peter Seebach - May 15, 2012, 6:16 p.m.
Wind River uses binary toolchains provided by Code Sourcery, but which
have different values for a couple of the preset variables than the
generic toolchains the external-csl toolchain feature supports.  If
these values were ?= assignments, we could just assign values to them
and share the code, rather than keeping modified copies.

Signed-off-by: Peter Seebach <peter.seebach@windriver.com>
---
 meta/conf/distro/include/tcmode-external-csl.inc |   18 +++++++++---------
 1 files changed, 9 insertions(+), 9 deletions(-)

Patch

diff --git a/meta/conf/distro/include/tcmode-external-csl.inc b/meta/conf/distro/include/tcmode-external-csl.inc
index 11c5df5..6bdd466 100644
--- a/meta/conf/distro/include/tcmode-external-csl.inc
+++ b/meta/conf/distro/include/tcmode-external-csl.inc
@@ -7,14 +7,14 @@  EXTERNAL_TOOLCHAIN ?= "/usr/local/csl/${TARGET_ARCH}"
 TOOLCHAIN_PATH_ADD = "${EXTERNAL_TOOLCHAIN}/bin:"
 PATH =. "${TOOLCHAIN_PATH_ADD}"
 
-CSL_TARGET_SYS_powerpc = "powerpc-linux-gnu"
-CSL_TARGET_SYS_powerpc64 = "powerpc-linux-gnu"
-CSL_TARGET_SYS_arm = "arm-none-linux-gnueabi"
-CSL_TARGET_SYS_mips = "mips-linux-gnu"
-CSL_TARGET_SYS_mipsel = "mips-linux-gnu"
-CSL_TARGET_SYS_mips64 = "mips-linux-gnu"
-CSL_TARGET_SYS_i686 = "i686-pc-linux-gnu"
-CSL_TARGET_SYS_i586 = "i686-pc-linux-gnu"
+CSL_TARGET_SYS_powerpc ?= "powerpc-linux-gnu"
+CSL_TARGET_SYS_powerpc64 ?= "powerpc-linux-gnu"
+CSL_TARGET_SYS_arm ?= "arm-none-linux-gnueabi"
+CSL_TARGET_SYS_mips ?= "mips-linux-gnu"
+CSL_TARGET_SYS_mipsel ?= "mips-linux-gnu"
+CSL_TARGET_SYS_mips64 ?= "mips-linux-gnu"
+CSL_TARGET_SYS_i686 ?= "i686-pc-linux-gnu"
+CSL_TARGET_SYS_i586 ?= "i686-pc-linux-gnu"
 CSL_TARGET_SYS = "${TARGET_SYS}"
 
 TARGET_PREFIX = "${CSL_TARGET_SYS}-"
@@ -58,7 +58,7 @@  def csl_target_core(d):
     }
     return coredata.get(d.getVar('TUNE_PKGARCH', True), '')
 
-CSL_TARGET_CORE = "${@csl_target_core(d)}"
+CSL_TARGET_CORE ?= "${@csl_target_core(d)}"
 
 # Unfortunately, the CSL ia32 toolchain has non-prefixed binaries in its
 # bindir (e.g. gcc, ld). To avoid this messing up our build, we avoid adding