[oe-commits] Constantin Musca : gcc-cross-canadian: enable multilib support

[git at git.openembedded.org]

Module: openembedded-core.git
Branch: master
Commit: ee7331e3e7d0b38f3e19ccf7e394537f5f653a22
URL:    http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=ee7331e3e7d0b38f3e19ccf7e394537f5f653a22

Author: Constantin Musca <constantinx.musca at intel.com>
Date:   Mon Feb 11 18:04:11 2013 +0200

gcc-cross-canadian: enable multilib support

Signed-off-by: Constantin Musca <constantinx.musca at intel.com>
Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>

---

 meta/recipes-devtools/gcc/gcc-4.7.inc             |    2 +-
 meta/recipes-devtools/gcc/gcc-cross-canadian.inc  |    1 +
 meta/recipes-devtools/gcc/gcc-multilib-config.inc |    3 ++-
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/meta/recipes-devtools/gcc/gcc-4.7.inc b/meta/recipes-devtools/gcc/gcc-4.7.inc
index 991f37c..8735e48 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 = "r17"
+PR = "r18"
 
 # 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/gcc-cross-canadian.inc b/meta/recipes-devtools/gcc/gcc-cross-canadian.inc
index f1824fa..10ddacf 100644
--- a/meta/recipes-devtools/gcc/gcc-cross-canadian.inc
+++ b/meta/recipes-devtools/gcc/gcc-cross-canadian.inc
@@ -6,3 +6,4 @@ BPN = "gcc"
 
 DEPENDS = "virtual/${TARGET_PREFIX}gcc virtual/${HOST_PREFIX}binutils-crosssdk virtual/nativesdk-${HOST_PREFIX}libc-for-gcc nativesdk-gettext"
 
+GCCMULTILIB = "--enable-multilib"
diff --git a/meta/recipes-devtools/gcc/gcc-multilib-config.inc b/meta/recipes-devtools/gcc/gcc-multilib-config.inc
index 9403aab..f89aa8e 100644
--- a/meta/recipes-devtools/gcc/gcc-multilib-config.inc
+++ b/meta/recipes-devtools/gcc/gcc-multilib-config.inc
@@ -41,7 +41,8 @@ python gcc_multilib_setup() {
         return
 
     mlprefix = d.getVar('MLPREFIX', True)
-    if ('%sgcc' % mlprefix) != d.getVar('PN', True):
+    pn = d.getVar('PN', True)
+    if ('%sgcc' % mlprefix) != pn and (not pn.startswith('gcc-cross-canadian')):
         return