aboutsummaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
Diffstat (limited to 'scripts')
-rw-r--r--scripts/build/arch/avr32.sh13
-rw-r--r--scripts/build/kernel/linux.sh2
-rw-r--r--scripts/build/libc/newlib.sh19
-rw-r--r--scripts/build/libc/uClibc.sh18
-rw-r--r--scripts/crosstool-NG.sh.in10
5 files changed, 20 insertions, 42 deletions
diff --git a/scripts/build/arch/avr32.sh b/scripts/build/arch/avr32.sh
deleted file mode 100644
index 2faf8d86..00000000
--- a/scripts/build/arch/avr32.sh
+++ /dev/null
@@ -1,13 +0,0 @@
-# Compute AVR32-specific values
-
-CT_DoArchTupleValues() {
- # gcc ./configure flags
- CT_ARCH_WITH_ARCH=
- CT_ARCH_WITH_ABI=
- CT_ARCH_WITH_CPU=
- CT_ARCH_WITH_TUNE=
- CT_ARCH_WITH_FPU=
- CT_ARCH_WITH_FLOAT=
- CT_TARGET_SYS=none
-
-}
diff --git a/scripts/build/kernel/linux.sh b/scripts/build/kernel/linux.sh
index 5f326803..2ebb03c1 100644
--- a/scripts/build/kernel/linux.sh
+++ b/scripts/build/kernel/linux.sh
@@ -119,6 +119,7 @@ do_kernel_install() {
CT_DoLog EXTRA "Installing kernel headers"
CT_DoExecLog ALL \
make -C "${kernel_path}" \
+ CROSS_COMPILE="${CT_TARGET}-" \
O="${CT_BUILD_DIR}/build-kernel-headers" \
ARCH=${kernel_arch} \
INSTALL_HDR_PATH="${CT_SYSROOT_DIR}/usr" \
@@ -129,6 +130,7 @@ do_kernel_install() {
CT_DoLog EXTRA "Checking installed headers"
CT_DoExecLog ALL \
make -C "${kernel_path}" \
+ CROSS_COMPILE="${CT_TARGET}-" \
O="${CT_BUILD_DIR}/build-kernel-headers" \
ARCH=${kernel_arch} \
INSTALL_HDR_PATH="${CT_SYSROOT_DIR}/usr" \
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).
diff --git a/scripts/crosstool-NG.sh.in b/scripts/crosstool-NG.sh.in
index ab654da7..a3514cb9 100644
--- a/scripts/crosstool-NG.sh.in
+++ b/scripts/crosstool-NG.sh.in
@@ -516,7 +516,12 @@ if [ -z "${CT_RESTART}" ]; then
# And help make go faster
JOBSFLAGS=
# Override the configured jobs with what's been given on the command line
- [ -n "${CT_JOBS}" ] && CT_PARALLEL_JOBS="${CT_JOBS}"
+ if [ -n "${CT_JOBS}" ]; then
+ if [ ! -z "`echo "${CT_JOBS}" | sed 's/[0-9]//g'`" ]; then
+ CT_Abort "Number of parallel jobs must be integer."
+ fi
+ CT_PARALLEL_JOBS="${CT_JOBS}"
+ fi
# Use the number of processors+1 when automatically setting the number of
# parallel jobs. Fall back to 1 if the host doesn't use GLIBC.
AUTO_JOBS=$((`getconf _NPROCESSORS_ONLN 2> /dev/null || echo 0` + 1))
@@ -524,6 +529,9 @@ if [ -z "${CT_RESTART}" ]; then
[ ${CT_PARALLEL_JOBS} -gt 0 ] && JOBSFLAGS="${JOBSFLAGS} -j${CT_PARALLEL_JOBS}"
JOBSFLAGS="${JOBSFLAGS} -l${CT_LOAD}"
+ # Override 'download only' option
+ [ -n "${CT_SOURCE}" ] && CT_ONLY_DOWNLOAD=y
+
# Now that we've set up $PATH and $CT_CFLAGS_FOR_HOST, sanity test that gcc
# is runnable so that the user can troubleshoot problems if not.
CT_DoStep DEBUG "Checking that we can run gcc -v"
generated by cgit v1.2.3 (git 2.39.1) at 2025-04-17 18:52:16 +0000