summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2012-07-05 10:30:14 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-07-05 12:36:45 +0100
commite3b3aaf4c7ddce12deb25efadfcb4e42f3a661df (patch)
treea1ca588321e6f05a7728103b3a2a7303300e7d2f /meta
parent3051f3644496ab570f3c6fb8f5def9d5843b1508 (diff)
downloadpoky-e3b3aaf4c7ddce12deb25efadfcb4e42f3a661df.tar.gz
gcc: fix collect2 host contamination problem properly
We added the autoconf cache line a while back to ensure that configure doesn't poke into some hardcoded host paths looking for things it shouldn't. Applying it as part of do_configure wasn't getting it to the do_compile tasks where much of the configure scripts are run by gcc. This changes it to a simple export to ensure it reaches the places it needs to and truly gets rid of the cross compile badness messages from the logs. (From OE-Core rev: af58d5c3a5c5e632aa20b1d007d47dbbfb4ed6e6) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-devtools/gcc/gcc-configure-common.inc9
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
49export 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
50EXTRA_OECONF_append_linux = " --enable-__cxa_atexit" 55EXTRA_OECONF_append_linux = " --enable-__cxa_atexit"
51EXTRA_OECONF_append_libc-uclibc = " --enable-__cxa_atexit" 56EXTRA_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}"