diff options
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/build/companion_libs/050-zlib.sh | 9 | ||||
| -rw-r--r-- | scripts/build/companion_libs/100-gmp.sh | 9 | ||||
| -rw-r--r-- | scripts/build/companion_libs/110-mpfr.sh | 9 | ||||
| -rw-r--r-- | scripts/build/companion_libs/121-isl.sh | 9 | ||||
| -rw-r--r-- | scripts/build/companion_libs/130-cloog.sh | 9 | ||||
| -rw-r--r-- | scripts/build/companion_libs/140-mpc.sh | 9 | ||||
| -rw-r--r-- | scripts/build/kernel/linux.sh | 11 |
7 files changed, 53 insertions, 12 deletions
diff --git a/scripts/build/companion_libs/050-zlib.sh b/scripts/build/companion_libs/050-zlib.sh index 45518e9..6e17819 100644 --- a/scripts/build/companion_libs/050-zlib.sh +++ b/scripts/build/companion_libs/050-zlib.sh @@ -97,8 +97,13 @@ do_zlib_backend() { CT_DoExecLog ALL make ${JOBSFLAGS} if [ "${CT_COMPLIBS_CHECK}" = "y" ]; then - CT_DoLog EXTRA "Checking zlib" - CT_DoExecLog ALL make ${JOBSFLAGS} -s check + if [ "${host}" = "${CT_BUILD}" ]; then + CT_DoLog EXTRA "Checking zlib" + CT_DoExecLog ALL make ${JOBSFLAGS} -s check + else + # Cannot run host binaries on build in a canadian cross + CT_DoLog EXTRA "Skipping check for zlib on the host" + fi fi CT_DoLog EXTRA "Installing zlib" diff --git a/scripts/build/companion_libs/100-gmp.sh b/scripts/build/companion_libs/100-gmp.sh index 6b526c8..c81874a 100644 --- a/scripts/build/companion_libs/100-gmp.sh +++ b/scripts/build/companion_libs/100-gmp.sh @@ -106,8 +106,13 @@ do_gmp_backend() { CT_DoExecLog ALL make ${JOBSFLAGS} if [ "${CT_COMPLIBS_CHECK}" = "y" ]; then - CT_DoLog EXTRA "Checking GMP" - CT_DoExecLog ALL make ${JOBSFLAGS} -s check + if [ "${host}" = "${CT_BUILD}" ]; then + CT_DoLog EXTRA "Checking GMP" + CT_DoExecLog ALL make ${JOBSFLAGS} -s check + else + # Cannot run host binaries on build in a canadian cross + CT_DoLog EXTRA "Skipping check for GMP on the host" + fi fi CT_DoLog EXTRA "Installing GMP" diff --git a/scripts/build/companion_libs/110-mpfr.sh b/scripts/build/companion_libs/110-mpfr.sh index 4b9bc64..a7b7f72 100644 --- a/scripts/build/companion_libs/110-mpfr.sh +++ b/scripts/build/companion_libs/110-mpfr.sh @@ -149,8 +149,13 @@ do_mpfr_backend() { CT_DoExecLog ALL make ${JOBSFLAGS} if [ "${CT_COMPLIBS_CHECK}" = "y" ]; then - CT_DoLog EXTRA "Checking MPFR" - CT_DoExecLog ALL make ${JOBSFLAGS} -s check + if [ "${host}" = "${CT_BUILD}" ]; then + CT_DoLog EXTRA "Checking MPFR" + CT_DoExecLog ALL make ${JOBSFLAGS} -s check + else + # Cannot run host binaries on build in a canadian cross + CT_DoLog EXTRA "Skipping check for MPFR on the host" + fi fi CT_DoLog EXTRA "Installing MPFR" diff --git a/scripts/build/companion_libs/121-isl.sh b/scripts/build/companion_libs/121-isl.sh index 8783f2d..ef93bbd 100644 --- a/scripts/build/companion_libs/121-isl.sh +++ b/scripts/build/companion_libs/121-isl.sh @@ -115,8 +115,13 @@ do_isl_backend() { CT_DoExecLog ALL make ${JOBSFLAGS} if [ "${CT_COMPLIBS_CHECK}" = "y" ]; then - CT_DoLog EXTRA "Checking ISL" - CT_DoExecLog ALL make ${JOBSFLAGS} -s check + if [ "${host}" = "${CT_BUILD}" ]; then + CT_DoLog EXTRA "Checking ISL" + CT_DoExecLog ALL make ${JOBSFLAGS} -s check + else + # Cannot run host binaries on build in a canadian cross + CT_DoLog EXTRA "Skipping check for ISL on the host" + fi fi CT_DoLog EXTRA "Installing ISL" diff --git a/scripts/build/companion_libs/130-cloog.sh b/scripts/build/companion_libs/130-cloog.sh index b6ea1e5..b21b028 100644 --- a/scripts/build/companion_libs/130-cloog.sh +++ b/scripts/build/companion_libs/130-cloog.sh @@ -112,8 +112,13 @@ do_cloog_backend() { CT_DoExecLog ALL make ${JOBSFLAGS} if [ "${CT_COMPLIBS_CHECK}" = "y" ]; then - CT_DoLog EXTRA "Checking CLooG" - CT_DoExecLog ALL make ${JOBSFLAGS} -s check + if [ "${host}" = "${CT_BUILD}" ]; then + CT_DoLog EXTRA "Checking CLooG" + CT_DoExecLog ALL make ${JOBSFLAGS} -s check + else + # Cannot run host binaries on build in a canadian cross + CT_DoLog EXTRA "Skipping check for CLooG on the host" + fi fi CT_DoLog EXTRA "Installing CLooG" diff --git a/scripts/build/companion_libs/140-mpc.sh b/scripts/build/companion_libs/140-mpc.sh index acb5fd3..e6efb4f 100644 --- a/scripts/build/companion_libs/140-mpc.sh +++ b/scripts/build/companion_libs/140-mpc.sh @@ -100,8 +100,13 @@ do_mpc_backend() { CT_DoExecLog ALL make ${JOBSFLAGS} if [ "${CT_COMPLIBS_CHECK}" = "y" ]; then - CT_DoLog EXTRA "Checking MPC" - CT_DoExecLog ALL make ${JOBSFLAGS} -s check + if [ "${host}" = "${CT_BUILD}" ]; then + CT_DoLog EXTRA "Checking MPC" + CT_DoExecLog ALL make ${JOBSFLAGS} -s check + else + # Cannot run host binaries on build in a canadian cross + CT_DoLog EXTRA "Skipping check for MPC on the host" + fi fi CT_DoLog EXTRA "Installing MPC" diff --git a/scripts/build/kernel/linux.sh b/scripts/build/kernel/linux.sh index 064631b..9cfc433 100644 --- a/scripts/build/kernel/linux.sh +++ b/scripts/build/kernel/linux.sh @@ -71,6 +71,17 @@ do_kernel_extract() { return 0 fi CT_Patch "linux" "${CT_KERNEL_VERSION}" + + # Disable building relocs application - it needs <linux/types.h> + # on the host, which may not be present on Cygwin or MacOS; it + # needs <elf.h>, which again is not present on MacOS; and most + # important, we don't need it to install the headers. + # This is not done as a patch, since it varies from Linux version + # to version - patching each particular Linux version would be + # too cumbersome. + CT_Pushd "${CT_SRC_DIR}/linux-${CT_KERNEL_VERSION}" + sed -i -r 's/(\$\(MAKE\) .* relocs)$/:/' arch/*/Makefile + CT_Popd } # Install kernel headers using headers_install from kernel sources. |