diff options
author | Yann E. MORIN" <yann.morin.1998@anciens.enib.fr> | 2008-11-13 18:22:23 (GMT) |
---|---|---|
committer | Yann E. MORIN" <yann.morin.1998@anciens.enib.fr> | 2008-11-13 18:22:23 (GMT) |
commit | 8fba8c273289329860d220f27666458bce46d7e9 (patch) | |
tree | 522d1f731a6c74db2e88448531fd80f1dcc8649a /scripts/build/libc | |
parent | 301fbac58eb4c024e3eda0dc13251bd5849be791 (diff) |
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(-)
Diffstat (limited to 'scripts/build/libc')
-rw-r--r-- | scripts/build/libc/eglibc.sh | 8 | ||||
-rw-r--r-- | scripts/build/libc/glibc.sh | 10 |
2 files changed, 9 insertions, 9 deletions
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 \ |