From 860a41bae6b863a289b06a9684d9cf6c58a307bd Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Tue, 26 Jul 2011 18:51:02 +0100 Subject: arch-ia32.inc: Fix up TUNE_ARCH variable conflicts The current approach causes duplicate values to appear in the TUNE_ARCH field and this patch addresses that. (From OE-Core rev: 02031d766f983cd7e01e468cb2c926604313cd2a) Signed-off-by: Richard Purdie --- meta/conf/machine/include/ia32/arch-ia32.inc | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'meta/conf/machine/include/ia32') diff --git a/meta/conf/machine/include/ia32/arch-ia32.inc b/meta/conf/machine/include/ia32/arch-ia32.inc index d1d66052a1..2709440db3 100644 --- a/meta/conf/machine/include/ia32/arch-ia32.inc +++ b/meta/conf/machine/include/ia32/arch-ia32.inc @@ -4,17 +4,19 @@ DEFAULTTUNE ?= "x86" TARGET_FPU ?= "" +X86ARCH32 ?= "i586" +X86ARCH64 ?= "x86_64" # ELF32 ABI TUNEVALID[m32] = "IA32 ELF32 standard ABI" TUNECONFLICTS[m32] = "m64" -TUNE_ARCH .= "${@bb.utils.contains("TUNE_FEATURES", "m32", "i586", "" ,d)}" +TUNE_ARCH .= "${@bb.utils.contains("TUNE_FEATURES", "m32", "${X86ARCH32}", "" ,d)}" TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "m32", "-m32", "", d)}" # ELF64 ABI TUNEVALID[m64] = "IA32e (x86_64) ELF64 standard ABI" TUNECONFLICT[m64] = "m32" -TUNE_ARCH .= "${@bb.utils.contains("TUNE_FEATURES", "m64", "x86_64", "" ,d)}" +TUNE_ARCH .= "${@bb.utils.contains("TUNE_FEATURES", "m64", "${X86ARCH64}", "" ,d)}" TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "m64", "-m64", "", d)}" TUNE_PKGARCH ?= "${@bb.utils.contains("TUNE_FEATURES", "m32", "x86", "x86_64", d)}" -- cgit v1.2.3-54-g00ecf