diff options
Diffstat (limited to 'meta/recipes-devtools/gcc')
-rw-r--r-- | meta/recipes-devtools/gcc/gcc-common.inc | 10 | ||||
-rw-r--r-- | meta/recipes-devtools/gcc/gcc-configure-common.inc | 3 |
2 files changed, 12 insertions, 1 deletions
diff --git a/meta/recipes-devtools/gcc/gcc-common.inc b/meta/recipes-devtools/gcc/gcc-common.inc index 69e0213e9f..7ec2f7e463 100644 --- a/meta/recipes-devtools/gcc/gcc-common.inc +++ b/meta/recipes-devtools/gcc/gcc-common.inc | |||
@@ -21,6 +21,16 @@ def get_gcc_mips_plt_setting(bb, d): | |||
21 | return "--with-mips-plt" | 21 | return "--with-mips-plt" |
22 | return "" | 22 | return "" |
23 | 23 | ||
24 | def get_gcc_multiarch_setting(bb, d): | ||
25 | if 'multiarch' in bb.data.getVar('DISTRO_FEATURES',d,1).split() : | ||
26 | if bb.data.getVar('TARGET_ARCH', d, 1) in [ 'i586', 'i686' ] : | ||
27 | return "--enable-targets=all" | ||
28 | if bb.data.getVar('TARGET_ARCH', d, 1) in [ 'powerpc' ] : | ||
29 | return "--enable-targets=powerpc64" | ||
30 | if bb.data.getVar('TARGET_ARCH', d, 1) in [ 'sparc' ] : | ||
31 | return "--enable-targets=all" | ||
32 | return "" | ||
33 | |||
24 | # We really need HOST_SYS here for some packages and TARGET_SYS for others. | 34 | # We really need HOST_SYS here for some packages and TARGET_SYS for others. |
25 | # For now, libgcc is most important so we fix for that - RP. | 35 | # For now, libgcc is most important so we fix for that - RP. |
26 | SHLIBSDIR = "${STAGING_DIR_TARGET}/shlibs" | 36 | SHLIBSDIR = "${STAGING_DIR_TARGET}/shlibs" |
diff --git a/meta/recipes-devtools/gcc/gcc-configure-common.inc b/meta/recipes-devtools/gcc/gcc-configure-common.inc index ae23e8ee49..d0149801db 100644 --- a/meta/recipes-devtools/gcc/gcc-configure-common.inc +++ b/meta/recipes-devtools/gcc/gcc-configure-common.inc | |||
@@ -42,7 +42,8 @@ EXTRA_OECONF = "${@['--enable-clocale=generic', ''][d.getVar('USE_NLS', 1) != 'n | |||
42 | ${EXTRA_OECONF_BASE} \ | 42 | ${EXTRA_OECONF_BASE} \ |
43 | ${EXTRA_OECONF_FPU} \ | 43 | ${EXTRA_OECONF_FPU} \ |
44 | ${EXTRA_OECONF_PATHS} \ | 44 | ${EXTRA_OECONF_PATHS} \ |
45 | ${@get_gcc_mips_plt_setting(bb, d)}" | 45 | ${@get_gcc_mips_plt_setting(bb, d)} \ |
46 | ${@get_gcc_multiarch_setting(bb, d)}" | ||
46 | 47 | ||
47 | # Build uclibc compilers without cxa_atexit support | 48 | # Build uclibc compilers without cxa_atexit support |
48 | EXTRA_OECONF_append_linux = " --enable-__cxa_atexit" | 49 | EXTRA_OECONF_append_linux = " --enable-__cxa_atexit" |