diff options
Diffstat (limited to 'meta/recipes-devtools/gcc')
-rw-r--r-- | meta/recipes-devtools/gcc/gcc-4.7.inc | 2 | ||||
-rw-r--r-- | meta/recipes-devtools/gcc/gcc-cross-canadian.inc | 1 | ||||
-rw-r--r-- | 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 @@ | |||
1 | require gcc-common.inc | 1 | require gcc-common.inc |
2 | 2 | ||
3 | PR = "r17" | 3 | PR = "r18" |
4 | 4 | ||
5 | # Third digit in PV should be incremented after a minor release | 5 | # Third digit in PV should be incremented after a minor release |
6 | # happens from this branch on gcc e.g. currently its 4.7.1 | 6 | # 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" | |||
6 | 6 | ||
7 | DEPENDS = "virtual/${TARGET_PREFIX}gcc virtual/${HOST_PREFIX}binutils-crosssdk virtual/nativesdk-${HOST_PREFIX}libc-for-gcc nativesdk-gettext" | 7 | DEPENDS = "virtual/${TARGET_PREFIX}gcc virtual/${HOST_PREFIX}binutils-crosssdk virtual/nativesdk-${HOST_PREFIX}libc-for-gcc nativesdk-gettext" |
8 | 8 | ||
9 | 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() { | |||
41 | return | 41 | return |
42 | 42 | ||
43 | mlprefix = d.getVar('MLPREFIX', True) | 43 | mlprefix = d.getVar('MLPREFIX', True) |
44 | if ('%sgcc' % mlprefix) != d.getVar('PN', True): | 44 | pn = d.getVar('PN', True) |
45 | if ('%sgcc' % mlprefix) != pn and (not pn.startswith('gcc-cross-canadian')): | ||
45 | return | 46 | return |
46 | 47 | ||
47 | 48 | ||