diff options
Diffstat (limited to 'meta/recipes-devtools/gcc')
-rw-r--r-- | meta/recipes-devtools/gcc/gcc-common.inc | 8 | ||||
-rw-r--r-- | meta/recipes-devtools/gcc/gcc-configure-common.inc | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/meta/recipes-devtools/gcc/gcc-common.inc b/meta/recipes-devtools/gcc/gcc-common.inc index f83f4da798..69e0213e9f 100644 --- a/meta/recipes-devtools/gcc/gcc-common.inc +++ b/meta/recipes-devtools/gcc/gcc-common.inc | |||
@@ -7,17 +7,17 @@ NATIVEDEPS = "" | |||
7 | 7 | ||
8 | inherit autotools gettext | 8 | inherit autotools gettext |
9 | 9 | ||
10 | FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/gcc-${PV}" | 10 | FILESDIR = "${@os.path.dirname(d.getVar('FILE',1))}/gcc-${PV}" |
11 | 11 | ||
12 | def get_gcc_fpu_setting(bb, d): | 12 | def get_gcc_fpu_setting(bb, d): |
13 | if bb.data.getVar('TARGET_FPU', d, 1) in [ 'soft' ]: | 13 | if d.getVar('TARGET_FPU', 1) in [ 'soft' ]: |
14 | return "--with-float=soft" | 14 | return "--with-float=soft" |
15 | if bb.data.getVar('TARGET_FPU', d, 1) in [ 'ppc-efd' ]: | 15 | if d.getVar('TARGET_FPU', 1) in [ 'ppc-efd' ]: |
16 | return "--enable-e500_double" | 16 | return "--enable-e500_double" |
17 | return "" | 17 | return "" |
18 | 18 | ||
19 | def get_gcc_mips_plt_setting(bb, d): | 19 | def get_gcc_mips_plt_setting(bb, d): |
20 | if bb.data.getVar('TARGET_ARCH', d, 1) in [ 'mips', 'mipsel' ] and 'mplt' in bb.data.getVar('DISTRO_FEATURES',d,1).split() : | 20 | if d.getVar('TARGET_ARCH', 1) in [ 'mips', 'mipsel' ] and 'mplt' in d.getVar('DISTRO_FEATURES',1).split() : |
21 | return "--with-mips-plt" | 21 | return "--with-mips-plt" |
22 | return "" | 22 | return "" |
23 | 23 | ||
diff --git a/meta/recipes-devtools/gcc/gcc-configure-common.inc b/meta/recipes-devtools/gcc/gcc-configure-common.inc index 2ddc3d7c9f..ae23e8ee49 100644 --- a/meta/recipes-devtools/gcc/gcc-configure-common.inc +++ b/meta/recipes-devtools/gcc/gcc-configure-common.inc | |||
@@ -27,7 +27,7 @@ EXTRA_OECONF_INTERMEDIATE ?= "" | |||
27 | 27 | ||
28 | GCCMULTILIB = "--disable-multilib" | 28 | GCCMULTILIB = "--disable-multilib" |
29 | 29 | ||
30 | EXTRA_OECONF = "${@['--enable-clocale=generic', ''][bb.data.getVar('USE_NLS', d, 1) != 'no']} \ | 30 | EXTRA_OECONF = "${@['--enable-clocale=generic', ''][d.getVar('USE_NLS', 1) != 'no']} \ |
31 | --with-gnu-ld \ | 31 | --with-gnu-ld \ |
32 | --enable-shared \ | 32 | --enable-shared \ |
33 | --enable-languages=${LANGUAGES} \ | 33 | --enable-languages=${LANGUAGES} \ |