diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-01-25 00:34:09 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-01-25 12:25:45 +0000 |
commit | c0e1272d1526484f1921f3dd14ca042798d530d9 (patch) | |
tree | e29de33c2cb3edf5c1c43bd772a4c98a77ec36a4 /meta/recipes-core/glibc/glibc.inc | |
parent | 23cb814b2761cbe42f1f76e66abb61d8d4584c54 (diff) | |
download | poky-c0e1272d1526484f1921f3dd14ca042798d530d9.tar.gz |
gcc/libc: Change bootstrap to use an intermediate sysroot and hence no longer overwrite files
Based upon patches from Dexuan Cui <dexuan.cui@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core/glibc/glibc.inc')
-rw-r--r-- | meta/recipes-core/glibc/glibc.inc | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/meta/recipes-core/glibc/glibc.inc b/meta/recipes-core/glibc/glibc.inc index cdfa06de90..127ae231d7 100644 --- a/meta/recipes-core/glibc/glibc.inc +++ b/meta/recipes-core/glibc/glibc.inc | |||
@@ -21,6 +21,21 @@ STAGINGCC = "gcc-cross-intermediate" | |||
21 | STAGINGCC_virtclass-nativesdk = "gcc-crosssdk-intermediate" | 21 | STAGINGCC_virtclass-nativesdk = "gcc-crosssdk-intermediate" |
22 | PATH_prepend = "${STAGING_BINDIR_TOOLCHAIN}.${STAGINGCC}:" | 22 | PATH_prepend = "${STAGING_BINDIR_TOOLCHAIN}.${STAGINGCC}:" |
23 | 23 | ||
24 | TOOLCHAIN_OPTIONS = " --sysroot=${STAGING_DIR_TCBOOTSTRAP}" | ||
25 | |||
26 | # siteconfig.bbclass runs configure which needs a working compiler | ||
27 | # For the compiler to work we need a working libc yet libc isn't | ||
28 | # in the sysroots directory at this point. This means the libc.so | ||
29 | # linker script won't work as the --sysroot setting isn't correct. | ||
30 | # Here we create a hacked up libc linker script and pass in the right | ||
31 | # flags to let configure work. Ugly. | ||
32 | EXTRASITECONFIG = "CFLAGS='${CFLAGS} -Wl,-L${WORKDIR}/site_config_libc -L${WORKDIR}/site_config_libc -L${SYSROOT_DESTDIR}${libdir} -L${SYSROOT_DESTDIR}${base_libdir} -Wl,-L${SYSROOT_DESTDIR}${libdir} -Wl,-L${SYSROOT_DESTDIR}${base_libdir}'" | ||
33 | siteconfig_do_siteconfig_gencache_prepend = " \ | ||
34 | mkdir -p ${WORKDIR}/site_config_libc; \ | ||
35 | cp ${SYSROOT_DESTDIR}${libdir}/libc.so ${WORKDIR}/site_config_libc; \ | ||
36 | sed -i -e 's# ${base_libdir}# ${SYSROOT_DESTDIR}${base_libdir}#g' -e 's# ${libdir}# ${SYSROOT_DESTDIR}${libdir}#g' ${WORKDIR}/site_config_libc/libc.so; \ | ||
37 | " | ||
38 | |||
24 | inherit autotools | 39 | inherit autotools |
25 | 40 | ||
26 | GLIBC_EXTRA_OECONF ?= "" | 41 | GLIBC_EXTRA_OECONF ?= "" |