diff options
Diffstat (limited to 'meta/recipes-devtools/gcc/gcc-configure-common.inc')
-rw-r--r-- | meta/recipes-devtools/gcc/gcc-configure-common.inc | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/meta/recipes-devtools/gcc/gcc-configure-common.inc b/meta/recipes-devtools/gcc/gcc-configure-common.inc index 4d11ef4f40..3dd9de785b 100644 --- a/meta/recipes-devtools/gcc/gcc-configure-common.inc +++ b/meta/recipes-devtools/gcc/gcc-configure-common.inc | |||
@@ -46,6 +46,11 @@ EXTRA_OECONF = "${@['--enable-clocale=generic', ''][d.getVar('USE_NLS', True) != | |||
46 | ${@get_gcc_mips_plt_setting(bb, d)} \ | 46 | ${@get_gcc_mips_plt_setting(bb, d)} \ |
47 | ${@get_gcc_multiarch_setting(bb, d)}" | 47 | ${@get_gcc_multiarch_setting(bb, d)}" |
48 | 48 | ||
49 | export gcc_cv_collect2_libs = 'none required' | ||
50 | # We need to set gcc_cv_collect2_libs else there is cross-compilation badness | ||
51 | # in the config.log files (which might not get generated until do_compile | ||
52 | # hence being missed by the insane do_configure check). | ||
53 | |||
49 | # Build uclibc compilers without cxa_atexit support | 54 | # Build uclibc compilers without cxa_atexit support |
50 | EXTRA_OECONF_append_linux = " --enable-__cxa_atexit" | 55 | EXTRA_OECONF_append_linux = " --enable-__cxa_atexit" |
51 | EXTRA_OECONF_append_libc-uclibc = " --enable-__cxa_atexit" | 56 | EXTRA_OECONF_append_libc-uclibc = " --enable-__cxa_atexit" |
@@ -110,10 +115,6 @@ do_configure () { | |||
110 | export CXXFLAGS_FOR_BUILD="${BUILD_CXXFLAGS}" | 115 | export CXXFLAGS_FOR_BUILD="${BUILD_CXXFLAGS}" |
111 | export LDFLAGS_FOR_BUILD="${BUILD_LDFLAGS}" | 116 | export LDFLAGS_FOR_BUILD="${BUILD_LDFLAGS}" |
112 | export ARCH_FLAGS_FOR_TARGET="${ARCH_FLAGS_FOR_TARGET}" | 117 | export ARCH_FLAGS_FOR_TARGET="${ARCH_FLAGS_FOR_TARGET}" |
113 | # We need to set this else there is cross-compilation badness | ||
114 | # in the config.log files (which might not get generated until do_compile | ||
115 | # hence being missed by the insane do_configure check). | ||
116 | export gcc_cv_collect2_libs="none required" | ||
117 | export CFLAGS_FOR_TARGET="${TARGET_CFLAGS}" | 118 | export CFLAGS_FOR_TARGET="${TARGET_CFLAGS}" |
118 | export CPPFLAGS_FOR_TARGET="${TARGET_CPPFLAGS}" | 119 | export CPPFLAGS_FOR_TARGET="${TARGET_CPPFLAGS}" |
119 | export CXXFLAGS_FOR_TARGET="${TARGET_CXXFLAGS}" | 120 | export CXXFLAGS_FOR_TARGET="${TARGET_CXXFLAGS}" |