diff options
Diffstat (limited to 'scripts/build')
-rw-r--r-- | scripts/build/binutils.sh | 1 | ||||
-rw-r--r-- | scripts/build/cc/gcc.sh | 11 | ||||
-rw-r--r-- | scripts/build/debug/200-duma.sh | 3 | ||||
-rw-r--r-- | scripts/build/libc/eglibc.sh | 8 | ||||
-rw-r--r-- | scripts/build/libc/glibc.sh | 10 | ||||
-rw-r--r-- | scripts/build/tools/200-sstrip.sh | 4 |
6 files changed, 18 insertions, 19 deletions
diff --git a/scripts/build/binutils.sh b/scripts/build/binutils.sh index beda7cf..9cf99af 100644 --- a/scripts/build/binutils.sh +++ b/scripts/build/binutils.sh @@ -36,7 +36,6 @@ do_binutils() { CFLAGS="${CT_CFLAGS_FOR_HOST}" \ CT_DoExecLog ALL \ "${CT_SRC_DIR}/${CT_BINUTILS_FILE}/configure" \ - ${CT_CANADIAN_OPT} \ --build=${CT_BUILD} \ --host=${CT_HOST} \ --target=${CT_TARGET} \ diff --git a/scripts/build/cc/gcc.sh b/scripts/build/cc/gcc.sh index 27cf840..089a9b9 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} \ diff --git a/scripts/build/debug/200-duma.sh b/scripts/build/debug/200-duma.sh index b14485d..79d09fe 100644 --- a/scripts/build/debug/200-duma.sh +++ b/scripts/build/debug/200-duma.sh @@ -44,8 +44,7 @@ do_debug_duma_build() { libs="${libs# }" CT_DoLog EXTRA "Building libraries '${libs}'" CT_DoExecLog ALL \ - make HOSTCC="${CT_CC_NATIVE}" \ - HOSTCXX="${CT_CC_NATIVE}" \ + make HOSTCC="${CT_BUILD}-gcc" \ CC="${CT_TARGET}-gcc" \ CXX="${CT_TARGET}-gcc" \ RANLIB="${CT_TARGET}-ranlib" \ diff --git a/scripts/build/libc/eglibc.sh b/scripts/build/libc/eglibc.sh index a803b5e..6c08cdb 100644 --- a/scripts/build/libc/eglibc.sh +++ b/scripts/build/libc/eglibc.sh @@ -149,7 +149,7 @@ do_libc_start_files() { CT_DoLog DEBUG "Using ar for target: '${cross_ar}'" CT_DoLog DEBUG "Using ranlib for target: '${cross_ranlib}'" - BUILD_CC=${CT_CC_NATIVE} \ + BUILD_CC="${CT_BUILD}-gcc" \ CC=${cross_cc} \ CXX=${cross_cxx} \ AR=${cross_ar} \ @@ -158,7 +158,7 @@ do_libc_start_files() { "${CT_SRC_DIR}/${CT_LIBC_FILE}/configure" \ --prefix=/usr \ --with-headers="${CT_HEADERS_DIR}" \ - --build="${CT_UNIQ_BUILD}" \ + --build="${CT_BUILD}" \ --host="${CT_TARGET}" \ --disable-profile \ --without-gd \ @@ -245,7 +245,7 @@ do_libc() { CT_DoLog DEBUG "Extra config args passed: '${extra_config}'" CT_DoLog DEBUG "Extra CC args passed : '${extra_cc_args}'" - BUILD_CC=${CT_CC_NATIVE} \ + BUILD_CC="${CT_BUILD}-gcc" \ CFLAGS="${CT_TARGET_CFLAGS} ${CT_LIBC_GLIBC_EXTRA_CFLAGS} -O" \ CC="${CT_TARGET}-gcc ${CT_LIBC_EXTRA_CC_ARGS} ${extra_cc_args}" \ AR=${CT_TARGET}-ar \ @@ -254,7 +254,7 @@ do_libc() { "${CT_SRC_DIR}/${CT_LIBC_FILE}/configure" \ --prefix=/usr \ --with-headers="${CT_HEADERS_DIR}" \ - --build=${CT_UNIQ_BUILD} \ + --build=${CT_BUILD} \ --host=${CT_TARGET} \ --disable-profile \ --without-gd \ diff --git a/scripts/build/libc/glibc.sh b/scripts/build/libc/glibc.sh index 02dfe63..b9eb631 100644 --- a/scripts/build/libc/glibc.sh +++ b/scripts/build/libc/glibc.sh @@ -105,7 +105,7 @@ do_libc_headers() { CC=${cross_cc} \ CT_DoExecLog ALL \ "${CT_SRC_DIR}/${CT_LIBC_FILE}/configure" \ - --build="${CT_UNIQ_BUILD}" \ + --build="${CT_BUILD}" \ --host="${CT_TARGET}" \ --prefix=/usr \ --with-headers="${CT_HEADERS_DIR}" \ @@ -272,7 +272,7 @@ do_libc_start_files() { # Please see the comment for the configure step in do_libc(). - BUILD_CC=${CT_CC_NATIVE} \ + BUILD_CC="${CT_BUILD}-gcc" \ CFLAGS="${CT_TARGET_CFLAGS} ${CT_LIBC_GLIBC_EXTRA_CFLAGS} -O " \ CC="${cross_cc} ${CT_LIBC_EXTRA_CC_ARGS} ${extra_cc_args}" \ AR=${CT_TARGET}-ar \ @@ -280,7 +280,7 @@ do_libc_start_files() { CT_DoExecLog ALL \ "${CT_SRC_DIR}/${CT_LIBC_FILE}/configure" \ --prefix=/usr \ - --build="${CT_UNIQ_BUILD}" \ + --build="${CT_BUILD}" \ --host=${CT_TARGET} \ --without-cvs \ --disable-profile \ @@ -400,7 +400,7 @@ do_libc() { # I don't want nptl! --disable-sanity-checks will shut up those # silly messages. GNU folks again, he? - BUILD_CC=${CT_CC_NATIVE} \ + BUILD_CC="${CT_BUILD}-gcc" \ CFLAGS="${CT_TARGET_CFLAGS} ${CT_LIBC_GLIBC_EXTRA_CFLAGS} -O" \ CC="${CT_TARGET}-gcc ${CT_LIBC_EXTRA_CC_ARGS} ${extra_cc_args}" \ AR=${CT_TARGET}-ar \ @@ -408,7 +408,7 @@ do_libc() { CT_DoExecLog ALL \ "${CT_SRC_DIR}/${CT_LIBC_FILE}/configure" \ --prefix=/usr \ - --build=${CT_UNIQ_BUILD} \ + --build=${CT_BUILD} \ --host=${CT_TARGET} \ --without-cvs \ --disable-profile \ diff --git a/scripts/build/tools/200-sstrip.sh b/scripts/build/tools/200-sstrip.sh index 461dfcf..fd7812a 100644 --- a/scripts/build/tools/200-sstrip.sh +++ b/scripts/build/tools/200-sstrip.sh @@ -19,7 +19,7 @@ case "${CT_SSTRIP_FROM}" in ( cd "${CT_SRC_DIR}/ELFkickers-${CT_SSTRIP_ELFKICKERS_VERSION}/sstrip"; tar cf - . ) |tar xf - CT_DoLog EXTRA "Building sstrip" - CT_DoExecLog ALL make CC="${CT_CC_NATIVE}" sstrip + CT_DoExecLog ALL make CC="${CT_HOST}-gcc" sstrip CT_DoLog EXTRA "Installing sstrip" CT_DoExecLog ALL install -m 755 sstrip "${CT_PREFIX_DIR}/bin/${CT_TARGET}-sstrip" @@ -48,7 +48,7 @@ case "${CT_SSTRIP_FROM}" in cd "${CT_BUILD_DIR}/build-sstrip" CT_DoLog EXTRA "Building sstrip" - CT_DoExecLog ALL ${CT_CC_NATIVE} -Wall -o sstrip "${CT_SRC_DIR}/sstrip/sstrip.c" + CT_DoExecLog ALL "${CT_HOST}-gcc" -Wall -o sstrip "${CT_SRC_DIR}/sstrip/sstrip.c" CT_DoLog EXTRA "Installing sstrip" CT_DoExecLog ALL install -m 755 sstrip "${CT_PREFIX_DIR}/bin/${CT_TARGET}-sstrip" |