From 0b42b2fc118bef8ce0d1473b146673182f5d1f78 Mon Sep 17 00:00:00 2001 From: Julian Pidancet Date: Thu, 1 Dec 2011 00:01:56 +0000 Subject: Fix multiarch DISTRO_FEATURE Make get_gcc_multiarch_setting more elegant. Use a dictionnary to store the config options and replace bb.data.getVar with d.getVar. Remove i686 from the architecture list because it doesn't seem to be a valid TARGET_ARCH any more in OE. Configure gdb (gdb and gdb-cross) with --enable-64-bit-bfd if multiarch DISTRO_FEATURE is present Signed-off-by: Julian Pidancet Signed-off-by: Richard Purdie --- meta/recipes-devtools/gcc/gcc-common.inc | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) (limited to 'meta/recipes-devtools/gcc/gcc-common.inc') diff --git a/meta/recipes-devtools/gcc/gcc-common.inc b/meta/recipes-devtools/gcc/gcc-common.inc index 7ec2f7e463..fe112d9d0a 100644 --- a/meta/recipes-devtools/gcc/gcc-common.inc +++ b/meta/recipes-devtools/gcc/gcc-common.inc @@ -22,13 +22,16 @@ def get_gcc_mips_plt_setting(bb, d): return "" def get_gcc_multiarch_setting(bb, d): - if 'multiarch' in bb.data.getVar('DISTRO_FEATURES',d,1).split() : - if bb.data.getVar('TARGET_ARCH', d, 1) in [ 'i586', 'i686' ] : - return "--enable-targets=all" - if bb.data.getVar('TARGET_ARCH', d, 1) in [ 'powerpc' ] : - return "--enable-targets=powerpc64" - if bb.data.getVar('TARGET_ARCH', d, 1) in [ 'sparc' ] : - return "--enable-targets=all" + target_arch = d.getVar('TARGET_ARCH', True) + multiarch_options = { + "i586": "--enable-targets=all", + "powerpc": "--enable-targets=powerpc64", + "sparc": "--enable-targets=all", + } + + if 'multiarch' in d.getVar('DISTRO_FEATURES', True).split() : + if target_arch in multiarch_options : + return multiarch_options[target_arch] return "" # We really need HOST_SYS here for some packages and TARGET_SYS for others. -- cgit 1.2.3-korg