From 8fba8c273289329860d220f27666458bce46d7e9 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN\"" Date: Thu, 13 Nov 2008 18:22:23 +0000 Subject: Merge #1195, #1196 and #1203 from /devel/YEM-build_host_target_cleanup: - Get rid of CT_CC_NATIVE - Get rid of CT_CANADIAN_OPT - Sanitise CT_BUILD vs. CT_HOST /trunk/scripts/build/tools/200-sstrip.sh | 4 2 2 0 /trunk/scripts/build/binutils.sh | 1 0 1 0 - /trunk/scripts/build/cc/gcc.sh | 11 6 5 0 +- /trunk/scripts/build/debug/200-duma.sh | 3 1 2 0 - /trunk/scripts/build/libc/glibc.sh | 10 5 5 0 +- /trunk/scripts/build/libc/eglibc.sh | 8 4 4 0 +- /trunk/scripts/crosstool.sh | 168 113 55 0 ++++++++++++++++++++++++++------------ /trunk/config/toolchain.in | 160 137 23 0 +++++++++++++++++++++++++++++++----- 8 files changed, 268 insertions(+), 97 deletions(-) --- scripts/build/cc/gcc.sh | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'scripts/build/cc/gcc.sh') diff --git a/scripts/build/cc/gcc.sh b/scripts/build/cc/gcc.sh index 27cf840e..089a9b91 100644 --- a/scripts/build/cc/gcc.sh +++ b/scripts/build/cc/gcc.sh @@ -126,11 +126,11 @@ do_cc_core() { CT_DoLog DEBUG "Extra config passed: '${extra_config}'" # Use --with-local-prefix so older gccs don't look in /usr/local (http://gcc.gnu.org/PR10532) - CC_FOR_BUILD="${CT_CC_NATIVE}" \ + CC_FOR_BUILD="${CT_BUILD}-gcc" \ CFLAGS="${CT_CFLAGS_FOR_HOST}" \ CT_DoExecLog ALL \ "${CT_SRC_DIR}/${CT_CC_FILE}/configure" \ - ${CT_CANADIAN_OPT} \ + --build=${CT_BUILD} \ --host=${CT_HOST} \ --target=${CT_TARGET} \ --prefix="${core_prefix_dir}" \ @@ -263,15 +263,16 @@ do_cc() { # detection problem only matters for gcc-3.2.x and later, I think. # --disable-nls to work around crash bug on ppc405, but also because # embedded systems don't really need message catalogs... - CC_FOR_BUILD="${CT_CC_NATIVE}" \ + CC_FOR_BUILD="${CT_BUILD}-gcc" \ CFLAGS="${CT_CFLAGS_FOR_HOST}" \ CFLAGS_FOR_TARGET="${CT_TARGET_CFLAGS}" \ CXXFLAGS_FOR_TARGET="${CT_TARGET_CFLAGS}" \ LDFLAGS_FOR_TARGET="${CT_TARGET_LDFLAGS}" \ CT_DoExecLog ALL \ "${CT_SRC_DIR}/${CT_CC_FILE}/configure" \ - ${CT_CANADIAN_OPT} \ - --target=${CT_TARGET} --host=${CT_HOST} \ + --build=${CT_BUILD} \ + --host=${CT_HOST} \ + --target=${CT_TARGET} \ --prefix="${CT_PREFIX_DIR}" \ ${CC_SYSROOT_ARG} \ ${extra_config} \ -- cgit v1.2.3