libgcc: Disable multilib install for nativesdk

Fixes errors when building SDK for multilibbed enabled
architectures.

[YOCTO #3832]

Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Constantin Musca <constantinx.musca@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

diff --git a/meta/recipes-devtools/gcc/gcc-4.7.inc b/meta/recipes-devtools/gcc/gcc-4.7.inc
index 2dc81f0543337facf2f27f2c6d63f31f48abda01..991f37c21c76d36e406176b87008b58404547813 100644 (file)
--- 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 550a3c9c9d280b98c9a72fad32fb5583fc009c15..47669a210ccf3845363a994b98aa5f7d2c7e57c6 100644 (file)
--- 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)