From 898a8094b1dcffc5ee54dbb612477c9bb3b8fd4b Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Tue, 5 Feb 2013 11:58:24 +0200 Subject: [PATCH] libgcc: Disable multilib install for nativesdk Fixes errors when building SDK for multilibbed enabled architectures. [YOCTO #3832] (From OE-Core rev: 09934f38df057e12af7d14791f7ab752e81093db) Signed-off-by: Khem Raj Signed-off-by: Constantin Musca Signed-off-by: Richard Purdie --- meta/recipes-devtools/gcc/gcc-4.7.inc | 2 +- meta/recipes-devtools/gcc/libgcc_4.7.bb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/recipes-devtools/gcc/gcc-4.7.inc b/meta/recipes-devtools/gcc/gcc-4.7.inc index 2dc81f0543..991f37c21c 100644 --- a/meta/recipes-devtools/gcc/gcc-4.7.inc +++ b/meta/recipes-devtools/gcc/gcc-4.7.inc @@ -1,6 +1,6 @@ require gcc-common.inc -PR = "r16" +PR = "r17" # Third digit in PV should be incremented after a minor release # happens from this branch on gcc e.g. currently its 4.7.1 diff --git a/meta/recipes-devtools/gcc/libgcc_4.7.bb b/meta/recipes-devtools/gcc/libgcc_4.7.bb index 550a3c9c9d..47669a210c 100644 --- a/meta/recipes-devtools/gcc/libgcc_4.7.bb +++ b/meta/recipes-devtools/gcc/libgcc_4.7.bb @@ -86,7 +86,7 @@ python do_multilib_install() { import re multilibs = d.getVar('MULTILIB_VARIANTS', True) - if not multilibs: + if not multilibs or bb.data.inherits_class('nativesdk', d): return binv = d.getVar('BINV', True)