From 5f05604cdf9d5bee8bf686ba2320258fda5f2676 Mon Sep 17 00:00:00 2001 From: Constantin Musca Date: Mon, 11 Feb 2013 18:04:11 +0200 Subject: gcc-cross-canadian: enable multilib support (From OE-Core rev: ee7331e3e7d0b38f3e19ccf7e394537f5f653a22) Signed-off-by: Constantin Musca Signed-off-by: Richard Purdie --- 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 991f37c21c..8735e48896 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 f1824fa997..10ddacf7fa 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 9403aab0bd..f89aa8ea7f 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 -- cgit v1.2.3-54-g00ecf