diff options
Diffstat (limited to 'scripts/build/libc')
| -rw-r--r-- | scripts/build/libc/newlib.sh | 19 | ||||
| -rw-r--r-- | scripts/build/libc/uClibc.sh | 18 |
2 files changed, 9 insertions, 28 deletions
diff --git a/scripts/build/libc/newlib.sh b/scripts/build/libc/newlib.sh index ca00a3f5..ba3d9699 100644 --- a/scripts/build/libc/newlib.sh +++ b/scripts/build/libc/newlib.sh @@ -27,12 +27,6 @@ do_libc_get() { http://mirrors.kernel.org/sources.redhat.com/newlib fi fi # ! custom location - - if [ "${CT_ATMEL_AVR32_HEADERS}" = "y" ]; then - CT_GetFile ${LIBC_NEWLIB_AVR_HDRS_BASE} \ - ${LIBC_NEWLIB_AVR_HDRS_EXT} \ - ${LIBC_NEWLIB_AVR_HDRS_URI} - fi } do_libc_extract() { @@ -44,13 +38,6 @@ do_libc_extract() { CT_Extract "newlib-${CT_LIBC_VERSION}" CT_Patch "newlib" "${CT_LIBC_VERSION}" - - if [ "${CT_ATMEL_AVR32_HEADERS}" = "y" ]; then - # The avr32header zip file extracts to avr32/*.h - # Put that in its directory, the same as normal tarballs - CT_Extract ${LIBC_NEWLIB_AVR_HDRS_BASE} \ - -d ${CT_SRC_DIR}/${LIBC_NEWLIB_AVR_HDRS_BASE} - fi } do_libc_check_config() { @@ -61,12 +48,6 @@ do_libc_start_files() { CT_DoStep INFO "Installing C library headers & start files" CT_DoExecLog ALL cp -a "${CT_SRC_DIR}/newlib-${CT_LIBC_VERSION}/newlib/libc/include/." \ "${CT_HEADERS_DIR}" - if [ "${CT_ATMEL_AVR32_HEADERS}" = "y" ]; then - CT_DoLog EXTRA "Installing Atmel's AVR32 headers" - CT_DoExecLog ALL mkdir -p "${CT_PREFIX_DIR}/${CT_TARGET}/include" - CT_DoExecLog ALL cp -r "${CT_SRC_DIR}/${LIBC_NEWLIB_AVR_HDRS_BASE}/avr32" \ - "${CT_PREFIX_DIR}/${CT_TARGET}/include/" - fi CT_EndStep } diff --git a/scripts/build/libc/uClibc.sh b/scripts/build/libc/uClibc.sh index d270915e..e6974b36 100644 --- a/scripts/build/libc/uClibc.sh +++ b/scripts/build/libc/uClibc.sh @@ -98,7 +98,7 @@ do_libc_start_files() { # newer ones that are referenced are not available CT_DoLog EXTRA "Applying configuration" CT_DoYes "" |CT_DoExecLog ALL \ - make CROSS="${cross}" \ + make CROSS_COMPILE="${cross}" \ PREFIX="${CT_SYSROOT_DIR}/" \ LOCALE_DATA_FILENAME="${uclibc_local_tarball}.tgz" \ oldconfig @@ -106,7 +106,7 @@ do_libc_start_files() { CT_DoLog EXTRA "Building headers" CT_DoExecLog ALL \ make ${CT_LIBC_UCLIBC_VERBOSITY} \ - CROSS="${cross}" \ + CROSS_COMPILE="${cross}" \ PREFIX="${CT_SYSROOT_DIR}/" \ LOCALE_DATA_FILENAME="${uclibc_local_tarball}.tgz" \ headers @@ -120,7 +120,7 @@ do_libc_start_files() { CT_DoLog EXTRA "Installing headers" CT_DoExecLog ALL \ make ${CT_LIBC_UCLIBC_VERBOSITY} \ - CROSS="${cross}" \ + CROSS_COMPILE="${cross}" \ PREFIX="${CT_SYSROOT_DIR}/" \ LOCALE_DATA_FILENAME="${uclibc_local_tarball}.tgz" \ ${install_rule} @@ -129,7 +129,7 @@ do_libc_start_files() { CT_DoLog EXTRA "Building start files" CT_DoExecLog ALL \ make ${CT_LIBC_UCLIBC_PARALLEL:+${JOBSFLAGS}} \ - CROSS="${cross}" \ + CROSS_COMPILE="${cross}" \ PREFIX="${CT_SYSROOT_DIR}/" \ STRIPTOOL=true \ ${CT_LIBC_UCLIBC_VERBOSITY} \ @@ -180,7 +180,7 @@ do_libc() { # use LIBC_EXTRA_CFLAGS here. CT_DoLog EXTRA "Applying configuration" CT_DoYes "" |CT_DoExecLog CFG \ - make CROSS=${CT_TARGET}- \ + make CROSS_COMPILE=${CT_TARGET}- \ PREFIX="${CT_SYSROOT_DIR}/" \ LOCALE_DATA_FILENAME="${uclibc_local_tarball}.tgz" \ oldconfig @@ -191,7 +191,7 @@ do_libc() { CT_DoLog EXTRA "Building C library" CT_DoExecLog ALL \ make -j1 \ - CROSS=${CT_TARGET}- \ + CROSS_COMPILE=${CT_TARGET}- \ PREFIX="${CT_SYSROOT_DIR}/" \ STRIPTOOL=true \ ${CT_LIBC_UCLIBC_VERBOSITY} \ @@ -199,7 +199,7 @@ do_libc() { pregen CT_DoExecLog ALL \ make ${CT_LIBC_UCLIBC_PARALLEL:+${JOBSFLAGS}} \ - CROSS=${CT_TARGET}- \ + CROSS_COMPILE=${CT_TARGET}- \ PREFIX="${CT_SYSROOT_DIR}/" \ STRIPTOOL=true \ ${CT_LIBC_UCLIBC_VERBOSITY} \ @@ -222,7 +222,7 @@ do_libc() { # CT_DoLog EXTRA "Installing C library" CT_DoExecLog ALL \ - make CROSS=${CT_TARGET}- \ + make CROSS_COMPILE=${CT_TARGET}- \ PREFIX="${CT_SYSROOT_DIR}/" \ STRIPTOOL=true \ ${CT_LIBC_UCLIBC_VERBOSITY} \ @@ -384,7 +384,7 @@ mungeuClibcConfig() { # " so people may need to update their paths slightly quoted_kernel_source=$(echo "${CT_HEADERS_DIR}" | sed -r -e 's,/include/?$,,; s,/,\\/,g;') quoted_headers_dir=$(echo "${CT_HEADERS_DIR}" | sed -r -e 's,/,\\/,g;') - # CROSS_COMPILER_PREFIX is left as is, as the CROSS parameter is forced on the command line + # CROSS_COMPILER_PREFIX is left as is, as the CROSS_COMPILE parameter is forced on the command line # DEVEL_PREFIX is left as '/usr/' because it is post-pended to $PREFIX, wich is the correct value of ${PREFIX}/${TARGET} # Some (old) versions of uClibc use KERNEL_SOURCE (which is _wrong_), and # newer versions use KERNEL_HEADERS (which is right). |