diff options
| author |   Ben Gardiner <bengardiner@nanometrics.ca> | 2010-10-13 11:26:25 +0000 |
|---|---|---|
| committer |   Denys Dmytriyenko <denis@denix.org> | 2010-10-20 15:47:33 -0400 |
| commit | f3b29a03710280fda6561b37313a56dd759befac (patch) | |
| tree | 997ed4a241786838e2980431a37ca4e2afbe1c4e /conf/distro/kaeilos.conf | |
| parent | ae3bc32a49b8e6221916d4fab3efd86723544a83 (diff) | |
| download | openembedded-f3b29a03710280fda6561b37313a56dd759befac.tar.gz | |
distro, toolchain-external: override TARGET_VENDOR with TOOLCHAIN_VENDOR
Trying to use an external toolchain like the 2009q1 toolchain from codesourcery
has some strange results since the toolchain has vendor 'none' but
distributions like angstrom set TARGET_VENDOR unconditionally.
This patch overrides the TARGET_VENDOR with the value of TOOLCHAIN_VENDOR,
if set. TOOLCHAIN_VENDOR can be set in the local configuration alongside the
other TOOLCHAIN_* variables. The override is performed in
toolchain-external.inc, as suggested by Koen Kooi [1]. It also reorders the
inclusion of the distro and toolchain-* so that toolchain-external can override
the value of TARGET_VENDOR, as suggested by Denys Dmytriyenko [2].
Tested with angstrom-2008.1 and the codesourcery 2009q1 toolchain by assigning
TOOLCHAIN_VENDOR = "-none"
TOOLCHAIN_TYPE = "external"
TOOLCHAIN_BRAND = "csl"
in addition to putting the CSL in the PATH.
[1] http://thread.gmane.org/gmane.comp.handhelds.openembedded/37918/focus=38047
[2] http://thread.gmane.org/gmane.comp.handhelds.openembedded/38176/focus=38188
Signed-off-by: Ben Gardiner <bengardiner@nanometrics.ca>
CC: Koen Kooi <k.kooi@student.utwente.nl>
CC: Víctor M. Jáquez L. <vjaquez@igalia.com>
CC: CC: Denys Dmytriyenko <denis@denix.org>
Signed-off-by: Koen Kooi <koen@openembedded.org>
Signed-off-by: Denys Dmytriyenko <denis@denix.org>
Diffstat (limited to 'conf/distro/kaeilos.conf')
| -rw-r--r-- | conf/distro/kaeilos.conf | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/conf/distro/kaeilos.conf b/conf/distro/kaeilos.conf index 1287ea1dac..6625ba1dd7 100644 --- a/conf/distro/kaeilos.conf +++ b/conf/distro/kaeilos.conf @@ -119,10 +119,6 @@ PREFERRED_VERSION_binutils_avr32 = "2.17" PREFERRED_VERSION_binutils-cross_avr32 = "2.17" PREFERRED_VERSION_binutils-cross-sdk_avr32 = "2.17" -# Toolchain virtuals: -require conf/distro/include/toolchain-${TOOLCHAIN_TYPE}.inc -require conf/distro/include/arm-thumb.inc - PREFERRED_PROVIDER_dbus-glib = "dbus-glib" PREFERRED_PROVIDER_hotplug = "udev" PREFERRED_PROVIDER_opkg ?= "opkg" @@ -135,6 +131,10 @@ ANGSTROM_BLACKLIST_pn-fso-apm = "regular apmd is good enough" require conf/distro/include/kaeilos.inc +# Toolchain virtuals: +require conf/distro/include/toolchain-${TOOLCHAIN_TYPE}.inc +require conf/distro/include/arm-thumb.inc + # If we're using an .ipk based rootfs, we want to have opkg installed so postinst script can run # We also take this opportunity to inject angstrom-version and the feed configs into the rootfs IPKG_VARIANT = "opkg angstrom-version ${ANGSTROM_FEED_CONFIGS}" |