From 4a0a49081143c53a3ff994c478f1a8ec435d8685 Mon Sep 17 00:00:00 2001 From: Alexey Neyman Date: Wed, 20 Mar 2019 17:24:03 -0700 Subject: Use explicit revision in xtensa-fsf-elf So that the build does not depend on internet connectivity. Signed-off-by: Alexey Neyman diff --git a/samples/xtensa-fsf-elf/crosstool.config b/samples/xtensa-fsf-elf/crosstool.config index 131df9e..1caffd1 100644 --- a/samples/xtensa-fsf-elf/crosstool.config +++ b/samples/xtensa-fsf-elf/crosstool.config @@ -10,17 +10,17 @@ CT_TARGET_CFLAGS="-mlongcalls" CT_TARGET_VENDOR="fsf" CT_BINUTILS_SRC_DEVEL=y CT_BINUTILS_DEVEL_URL="https://github.com/espressif/binutils-gdb.git" -CT_BINUTILS_DEVEL_BRANCH="esp32-2018r1_binutils-2_30" +CT_BINUTILS_DEVEL_REVISION="0104f7d3" CT_BINUTILS_V_2_30=y CT_NEWLIB_SRC_DEVEL=y CT_NEWLIB_DEVEL_URL="https://github.com/espressif/newlib-esp32.git" -CT_NEWLIB_DEVEL_BRANCH="esp32-2018r1_newlib-2_2_0" +CT_NEWLIB_DEVEL_REVISION="fdbb7b81" CT_LIBC_NEWLIB_TARGET_CFLAGS="-DSIGNAL_PROVIDED -DABORT_PROVIDED -DMALLOC_PROVIDED" CT_LIBC_NEWLIB_DISABLE_SUPPLIED_SYSCALLS=y CT_GCC_SRC_DEVEL=y CT_GCC_DEVEL_VCS_git=y CT_GCC_DEVEL_URL="https://github.com/espressif/gcc.git" -CT_GCC_DEVEL_BRANCH="esp32-2018r1_gcc-8_2_0" +CT_GCC_DEVEL_REVISION="bae67e9e" CT_CC_GCC_ENABLE_CXX_FLAGS="-fno-rtti -ffunction-sections" CT_CC_GCC_CORE_EXTRA_CONFIG_ARRAY="--enable-threads=posix" CT_CC_GCC_EXTRA_CONFIG_ARRAY="--disable-libstdcxx-verbose --enable-threads=posix --enable-gcov-custom-rtio" @@ -31,7 +31,7 @@ CT_CC_LANG_CXX=y CT_DEBUG_GDB=y CT_GDB_SRC_DEVEL=y CT_GDB_DEVEL_URL="https://github.com/espressif/binutils-gdb.git" -CT_GDB_DEVEL_BRANCH="esp32-2018r1_gdb-8_1" +CT_GDB_DEVEL_REVISION="a9ff2591" CT_GDB_V_8_1=y CT_ISL_V_0_19=y CT_COMP_TOOLS_AUTOCONF=y -- cgit v0.10.2-6-g49f6 From 5e82ca9e3d39d022ab5dd8558d4543e2684863a8 Mon Sep 17 00:00:00 2001 From: Alexey Neyman Date: Wed, 20 Mar 2019 17:40:33 -0700 Subject: Only build libinproctrace for *-linux-gnu targets Signed-off-by: Alexey Neyman diff --git a/config/debug/gdb.in.native b/config/debug/gdb.in.native index 1ee8ad1..df3ca7c 100644 --- a/config/debug/gdb.in.native +++ b/config/debug/gdb.in.native @@ -26,10 +26,12 @@ if GDB_NATIVE || GDB_GDBSERVER config GDB_NATIVE_BUILD_IPA_LIB bool prompt "Build the IPA library" + depends on LIBC_GLIBC depends on GDB_HAS_IPA_LIB && !GDB_NATIVE_STATIC help gdbserver >= 7.2 comes with an optional library to use tracepoints, - the In Process Agent (IPA) library, libinproctrace.so. + the In Process Agent (IPA) library, libinproctrace.so. This library + uses some GNU extensions from the C library. Say 'y' if you intend to use tracepoints when debugging your programs with gdbserver. -- cgit v0.10.2-6-g49f6 From cc3686ec2ff8e1e1d36cd2ea0b16922e0a441ed7 Mon Sep 17 00:00:00 2001 From: Alexey Neyman Date: Wed, 20 Mar 2019 18:16:11 -0700 Subject: An artifact of merging native/gdbserver backends ... resulted in an attempt to build libinproctrace.so whenever any of the {gdbserver, native gdb} was enabled. Signed-off-by: Alexey Neyman diff --git a/scripts/build/debug/300-gdb.sh b/scripts/build/debug/300-gdb.sh index 15e0684..a9aae30 100644 --- a/scripts/build/debug/300-gdb.sh +++ b/scripts/build/debug/300-gdb.sh @@ -114,15 +114,15 @@ do_debug_gdb_build() native_extra_config+=("--disable-gdbserver") else native_extra_config+=("--enable-gdbserver") - if [ "${CT_GDB_NATIVE_BUILD_IPA_LIB}" = "y" ]; then - gdbserver_extra_config+=("--enable-inprocess-agent") - else - gdbserver_extra_config+=("--disable-inprocess-agent") - fi if [ "${CT_GDB_NATIVE}" != "y" ]; then subdir=gdb/gdbserver/ fi fi + if [ "${CT_GDB_NATIVE_BUILD_IPA_LIB}" = "y" ]; then + native_extra_config+=("--enable-inprocess-agent") + else + native_extra_config+=("--disable-inprocess-agent") + fi export ac_cv_func_strncmp_works=yes -- cgit v0.10.2-6-g49f6 From 31002a0c0a5c2efe3ed3861a012a44e4888bf3d2 Mon Sep 17 00:00:00 2001 From: Alexey Neyman Date: Mon, 25 Mar 2019 14:05:25 -0700 Subject: Add an ability to mark a configuration as invalid ... so that the build will fail early and predictably. Signed-off-by: Alexey Neyman diff --git a/config/global.in b/config/global.in index f5df002..94d2191 100644 --- a/config/global.in +++ b/config/global.in @@ -38,6 +38,9 @@ config CONFIG_VERSION default "0" if VCHECK = "load" || VCHECK = "save" default CONFIG_VERSION_CURRENT +config INVALID_CONFIGURATION + bool + if VCHECK = "warning" comment "*************************************************************************" comment "Loaded configuration was generated by a previous version of crosstool-NG." diff --git a/maintainer/kconfig-versions.template b/maintainer/kconfig-versions.template index 3db512e..4ac81be 100644 --- a/maintainer/kconfig-versions.template +++ b/maintainer/kconfig-versions.template @@ -276,6 +276,25 @@ config @@fork|@@_VERY_OLD #!end-foreach endchoice + +# A flag indicating that no valid selections exist for the version. +# This may happen if there are conflicting requirements set by +# the host system and/or other packages. +config @@fork|@@_NO_VERSIONS + def_bool y + select INVALID_CONFIGURATION + depends on !@@fork|@@_VERY_NEW +#!foreach version + depends on !@@fork|@@_V_@@ver_sel|@@ +#!end-foreach + depends on !@@fork|@@_VERY_OLD + +if @@fork|@@_NO_VERSIONS +comment "WARNING!" +comment "| The @@master@@ package has no viable versions" +comment "| due to conflicting constraints." +endif + #!end-if #!if [ -n "@@versionlocked@@" ] diff --git a/scripts/crosstool-NG.sh b/scripts/crosstool-NG.sh index db15b89..6014e4a 100644 --- a/scripts/crosstool-NG.sh +++ b/scripts/crosstool-NG.sh @@ -32,6 +32,8 @@ if [ -z "${CT_ALLOW_BUILD_AS_ROOT_SURE}" ]; then fi fi +CT_TestAndAbort "Invalid configuration. Run 'ct-ng menuconfig' and check which options select INVALID_CONFIGURATION." -n "${CT_INVALID_CONFIGURATION}" + # If we want an interactive debug-shell, we must ensure these FDs # are indeed connected to a terminal (and not redirected in any way). if [ "${CT_DEBUG_INTERACTIVE}" = "y" -a ! \( -t 0 -a -t 6 -a -t 2 \) ]; then -- cgit v0.10.2-6-g49f6 From c65df691de2209fd45688349fc46b46004212124 Mon Sep 17 00:00:00 2001 From: Alexey Neyman Date: Mon, 25 Mar 2019 14:18:56 -0700 Subject: Mark binutils/gdb requirements for RISC-V Signed-off-by: Alexey Neyman diff --git a/config/arch/riscv.in b/config/arch/riscv.in index 109556a..86676f3 100644 --- a/config/arch/riscv.in +++ b/config/arch/riscv.in @@ -11,6 +11,8 @@ ## select ARCH_SUPPORTS_WITH_ARCH ## select ARCH_SUPPORTS_WITH_TUNE ## select GCC_REQUIRE_7_or_later +## select BINUTILS_REQUIRE_2_28_or_later +## select GDB_REQUIRE_8_0_or_later ## help The RISC-V architecture, as defined by: ## help http://www.riscv.org/ -- cgit v0.10.2-6-g49f6 From d4fd69d5f1348613c22c88031de84d7dafd7301f Mon Sep 17 00:00:00 2001 From: Alexey Neyman Date: Wed, 27 Mar 2019 00:46:59 -0700 Subject: Change the "no viable version" check ... to make it easier to trace from `ct-ng menuconfig`. Signed-off-by: Alexey Neyman diff --git a/maintainer/kconfig-versions.template b/maintainer/kconfig-versions.template index 4ac81be..61414f5 100644 --- a/maintainer/kconfig-versions.template +++ b/maintainer/kconfig-versions.template @@ -281,13 +281,14 @@ endchoice # This may happen if there are conflicting requirements set by # the host system and/or other packages. config @@fork|@@_NO_VERSIONS - def_bool y + bool select INVALID_CONFIGURATION - depends on !@@fork|@@_VERY_NEW + default n if @@fork|@@_VERY_NEW #!foreach version - depends on !@@fork|@@_V_@@ver_sel|@@ + default n if @@fork|@@_V_@@ver_sel|@@ #!end-foreach - depends on !@@fork|@@_VERY_OLD + default n if @@fork|@@_VERY_OLD + default y if @@fork|@@_NO_VERSIONS comment "WARNING!" -- cgit v0.10.2-6-g49f6 From 19cc968f33e9fa6eea2082e2ac5a0ca6ef3390cf Mon Sep 17 00:00:00 2001 From: Alexey Neyman Date: Mon, 1 Apr 2019 21:02:36 -0700 Subject: Require WCHAR in uClibc for all GDB versions if building natively. 7.12.1 and 7.11.1 are also breaking in absence of Signed-off-by: Alexey Neyman diff --git a/config/debug/gdb.in.native b/config/debug/gdb.in.native index df3ca7c..101e824 100644 --- a/config/debug/gdb.in.native +++ b/config/debug/gdb.in.native @@ -6,7 +6,7 @@ config GDB_NATIVE depends on ! BARE_METAL depends on ! LIBC_BIONIC depends on CC_LANG_CXX || !GDB_8_0_or_later - select LIBC_UCLIBC_WCHAR if LIBC_UCLIBC && GDB_8_0_or_later + select LIBC_UCLIBC_WCHAR if LIBC_UCLIBC select EXPAT_TARGET select NCURSES_TARGET help -- cgit v0.10.2-6-g49f6 From a34f7e81ae93ed50a491e68d526a41e8b3a135a6 Mon Sep 17 00:00:00 2001 From: Alexey Neyman Date: Mon, 1 Apr 2019 23:55:32 -0700 Subject: Only select GDB version if GDB is enabled ... which fixes a bogus warning when configuration without GDB is loaded. Signed-off-by: Alexey Neyman diff --git a/config/arch/riscv.in b/config/arch/riscv.in index 86676f3..f4b3eeb 100644 --- a/config/arch/riscv.in +++ b/config/arch/riscv.in @@ -12,7 +12,7 @@ ## select ARCH_SUPPORTS_WITH_TUNE ## select GCC_REQUIRE_7_or_later ## select BINUTILS_REQUIRE_2_28_or_later -## select GDB_REQUIRE_8_0_or_later +## select GDB_REQUIRE_8_0_or_later if DEBUG_GDB ## help The RISC-V architecture, as defined by: ## help http://www.riscv.org/ -- cgit v0.10.2-6-g49f6 From f9b57cc78a9ba496942743046a0d640a3daed026 Mon Sep 17 00:00:00 2001 From: Alexey Neyman Date: Tue, 2 Apr 2019 08:48:27 -0700 Subject: Enable zlib companion lib if building LTO While we may use build machine's library when building a simple cross, we won't have it for the host machine in a canadian build. Until there are separate selectables for the build/host components, just build our own local zlib. Signed-off-by: Alexey Neyman diff --git a/config/cc/gcc.in b/config/cc/gcc.in index 6f68334..849b1ad 100644 --- a/config/cc/gcc.in +++ b/config/cc/gcc.in @@ -174,6 +174,7 @@ config CC_GCC_USE_LTO bool "Enable LTO" default y depends on ! STATIC_TOOLCHAIN + select ZLIB_NEEDED help Enable the Link Time Optimisations. -- cgit v0.10.2-6-g49f6 From 8e24bb22d0f5f35c97af75bffbe3ebf052604c9e Mon Sep 17 00:00:00 2001 From: Alexey Neyman Date: Thu, 4 Apr 2019 16:43:51 -0700 Subject: Do not include config/configure.in into the release tarball Fixes #1176 Signed-off-by: Alexey Neyman diff --git a/Makefile.am b/Makefile.am index 6c224c1..37c3239 100644 --- a/Makefile.am +++ b/Makefile.am @@ -8,7 +8,6 @@ SUBDIRS = kconfig bin_SCRIPTS = ct-ng CLEANFILES = ct-ng bash-completion/ct-ng docs/ct-ng.1 EXTRA_DIST = bootstrap ct-ng.in bash-completion/ct-ng.in \ - config/configure.in.in \ docs/ct-ng.1.in packages maintainer testing if INSTALL_BASH_COMPLETION @@ -18,9 +17,9 @@ endif man1_MANS = docs/ct-ng.1 -# paths.sh generated by configure +# paths.sh and configure.in are generated by configure nobase_dist_pkgdata_DATA = $(verbatim_data) -nobase_nodist_pkgdata_DATA = paths.sh +nobase_nodist_pkgdata_DATA = paths.sh config/configure.in # ct-ng, as renamed by the installation ctng_progname = `echo ct-ng | sed '$(transform)'` diff --git a/bootstrap b/bootstrap index 787966e..6c3d6ae 100755 --- a/bootstrap +++ b/bootstrap @@ -801,10 +801,10 @@ msg "*** Gathering the list of data files to install" scripts/compile | scripts/missing | scripts/depcomp | scripts/ltmain.sh | scripts/install-sh) continue ;; - # Special hack for configure.in.in - replace with the file that configure + # # will produce. FIXME: create this file at the time of 'ct-ng build'. - config/configure.in.in) - f=config/configure.in + config/configure.in.in | config/configure.in) + continue ;; esac # Checks & substitutions above may result in duplicate files -- cgit v0.10.2-6-g49f6 From 693d3943b10665b99a31ab1f3b4058fb4b3a32d1 Mon Sep 17 00:00:00 2001 From: Alexey Neyman Date: Thu, 4 Apr 2019 16:47:50 -0700 Subject: Rename JOBSFLAGS -> CT_JOBSFLAGS ... so that it is saved/restored when restarting the build. Signed-off-by: Alexey Neyman diff --git a/scripts/build/binutils/binutils.sh b/scripts/build/binutils/binutils.sh index 4d1bf46..2a738de 100644 --- a/scripts/build/binutils/binutils.sh +++ b/scripts/build/binutils/binutils.sh @@ -199,11 +199,11 @@ do_binutils_backend() { if [ "${static_build}" = "y" ]; then extra_make_flags+=("LDFLAGS=${ldflags} -all-static") CT_DoLog EXTRA "Prepare binutils for static build" - CT_DoExecLog ALL make ${JOBSFLAGS} configure-host + CT_DoExecLog ALL make ${CT_JOBSFLAGS} configure-host fi CT_DoLog EXTRA "Building binutils" - CT_DoExecLog ALL make "${extra_make_flags[@]}" ${JOBSFLAGS} + CT_DoExecLog ALL make "${extra_make_flags[@]}" ${CT_JOBSFLAGS} CT_DoLog EXTRA "Installing binutils" CT_DoExecLog ALL make install @@ -222,7 +222,7 @@ do_binutils_backend() { fi manuals_install=( "${manuals_for[@]/#/install-pdf-}" ) manuals_install+=( "${manuals_for[@]/#/install-html-}" ) - CT_DoExecLog ALL make ${JOBSFLAGS} pdf html + CT_DoExecLog ALL make ${CT_JOBSFLAGS} pdf html CT_DoExecLog ALL make "${manuals_install[@]}" fi @@ -290,7 +290,7 @@ do_elf2flt_backend() { "${CT_ELF2FLT_EXTRA_CONFIG_ARRAY[@]}" CT_DoLog EXTRA "Building elf2flt" - CT_DoExecLog ALL make ${JOBSFLAGS} CPU=${CT_ARCH} + CT_DoExecLog ALL make ${CT_JOBSFLAGS} CPU=${CT_ARCH} CT_DoLog EXTRA "Installing elf2flt" CT_DoExecLog ALL make install @@ -349,7 +349,7 @@ do_binutils_for_target() { "${CT_BINUTILS_EXTRA_CONFIG_ARRAY[@]}" CT_DoLog EXTRA "Building binutils' libraries (${targets[*]}) for target" - CT_DoExecLog ALL make ${JOBSFLAGS} "${build_targets[@]}" + CT_DoExecLog ALL make ${CT_JOBSFLAGS} "${build_targets[@]}" CT_DoLog EXTRA "Installing binutils' libraries (${targets[*]}) for target" CT_DoExecLog ALL make DESTDIR="${CT_SYSROOT_DIR}" "${install_targets[@]}" diff --git a/scripts/build/cc/gcc.sh b/scripts/build/cc/gcc.sh index ce7fea4..60f259d 100644 --- a/scripts/build/cc/gcc.sh +++ b/scripts/build/cc/gcc.sh @@ -618,23 +618,23 @@ do_gcc_core_backend() { # Next we have to configure gcc, create libgcc.mk then edit it... # So much easier if we just edit the source tree, but hey... if [ ! -f "${CT_SRC_DIR}/gcc/gcc/BASE-VER" ]; then - CT_DoExecLog CFG make ${JOBSFLAGS} configure-libiberty - CT_DoExecLog ALL make ${JOBSFLAGS} -C libiberty libiberty.a - CT_DoExecLog CFG make ${JOBSFLAGS} configure-gcc configure-libcpp - CT_DoExecLog ALL make ${JOBSFLAGS} all-libcpp + CT_DoExecLog CFG make ${CT_JOBSFLAGS} configure-libiberty + CT_DoExecLog ALL make ${CT_JOBSFLAGS} -C libiberty libiberty.a + CT_DoExecLog CFG make ${CT_JOBSFLAGS} configure-gcc configure-libcpp + CT_DoExecLog ALL make ${CT_JOBSFLAGS} all-libcpp else - CT_DoExecLog CFG make ${JOBSFLAGS} configure-gcc configure-libcpp configure-build-libiberty - CT_DoExecLog ALL make ${JOBSFLAGS} all-libcpp all-build-libiberty + CT_DoExecLog CFG make ${CT_JOBSFLAGS} configure-gcc configure-libcpp configure-build-libiberty + CT_DoExecLog ALL make ${CT_JOBSFLAGS} all-libcpp all-build-libiberty fi # HACK: gcc-4.2 uses libdecnumber to build libgcc.mk, so build it here. if [ -d "${CT_SRC_DIR}/gcc/libdecnumber" ]; then - CT_DoExecLog CFG make ${JOBSFLAGS} configure-libdecnumber - CT_DoExecLog ALL make ${JOBSFLAGS} -C libdecnumber libdecnumber.a + CT_DoExecLog CFG make ${CT_JOBSFLAGS} configure-libdecnumber + CT_DoExecLog ALL make ${CT_JOBSFLAGS} -C libdecnumber libdecnumber.a fi # HACK: gcc-4.8 uses libbacktrace to make libgcc.mvars, so make it here. if [ -d "${CT_SRC_DIR}/gcc/libbacktrace" ]; then - CT_DoExecLog CFG make ${JOBSFLAGS} configure-libbacktrace - CT_DoExecLog ALL make ${JOBSFLAGS} -C libbacktrace + CT_DoExecLog CFG make ${CT_JOBSFLAGS} configure-libbacktrace + CT_DoExecLog ALL make ${CT_JOBSFLAGS} -C libbacktrace fi libgcc_rule="libgcc.mvars" @@ -652,7 +652,7 @@ do_gcc_core_backend() { repair_cc="" fi - CT_DoExecLog ALL make ${JOBSFLAGS} -C gcc ${libgcc_rule} \ + CT_DoExecLog ALL make ${CT_JOBSFLAGS} -C gcc ${libgcc_rule} \ ${repair_cc} sed -r -i -e 's@-lc@@g' gcc/${libgcc_rule} else # build_libgcc @@ -681,9 +681,9 @@ do_gcc_core_backend() { esac CT_DoLog EXTRA "Building ${log_txt}" - CT_DoExecLog ALL make ${JOBSFLAGS} ${core_targets_all} + CT_DoExecLog ALL make ${CT_JOBSFLAGS} ${core_targets_all} - # Do not pass ${JOBSFLAGS} here: recent GCC builds have been failing + # Do not pass ${CT_JOBSFLAGS} here: recent GCC builds have been failing # in parallel 'make install' at random locations: libitm, libcilk, # always for the files that are installed more than once to the same # location (such as libitm.info). @@ -1169,11 +1169,11 @@ do_gcc_backend() { if [ "${CT_CANADIAN}" = "y" ]; then CT_DoLog EXTRA "Building libiberty" - CT_DoExecLog ALL make ${JOBSFLAGS} all-build-libiberty + CT_DoExecLog ALL make ${CT_JOBSFLAGS} all-build-libiberty fi CT_DoLog EXTRA "Building final gcc compiler" - CT_DoExecLog ALL make ${JOBSFLAGS} all + CT_DoExecLog ALL make ${CT_JOBSFLAGS} all # See the note on issues with parallel 'make install' in GCC above. CT_DoLog EXTRA "Installing final gcc compiler" diff --git a/scripts/build/companion_libs/050-zlib.sh b/scripts/build/companion_libs/050-zlib.sh index 868bf3d..8c6a0f6 100644 --- a/scripts/build/companion_libs/050-zlib.sh +++ b/scripts/build/companion_libs/050-zlib.sh @@ -113,7 +113,7 @@ do_zlib_backend() { esac CT_DoLog EXTRA "Building zlib" - CT_DoExecLog ALL make "${extra_make[@]}" ${JOBSFLAGS} + CT_DoExecLog ALL make "${extra_make[@]}" ${CT_JOBSFLAGS} if [ "${CT_COMPLIBS_CHECK}" = "y" ]; then if [ "${host}" = "${CT_BUILD}" ]; then diff --git a/scripts/build/companion_libs/100-gmp.sh b/scripts/build/companion_libs/100-gmp.sh index 272af66..4e8c12f 100644 --- a/scripts/build/companion_libs/100-gmp.sh +++ b/scripts/build/companion_libs/100-gmp.sh @@ -105,12 +105,12 @@ do_gmp_backend() { "${extra_config[@]}" CT_DoLog EXTRA "Building GMP" - CT_DoExecLog ALL make ${JOBSFLAGS} + CT_DoExecLog ALL make ${CT_JOBSFLAGS} if [ "${CT_COMPLIBS_CHECK}" = "y" ]; then if [ "${host}" = "${CT_BUILD}" ]; then CT_DoLog EXTRA "Checking GMP" - CT_DoExecLog ALL make ${JOBSFLAGS} -s check + CT_DoExecLog ALL make ${CT_JOBSFLAGS} -s check else # Cannot run host binaries on build in a canadian cross CT_DoLog EXTRA "Skipping check for GMP on the host" diff --git a/scripts/build/companion_libs/110-mpfr.sh b/scripts/build/companion_libs/110-mpfr.sh index b4be3f4..d2cb9f6 100644 --- a/scripts/build/companion_libs/110-mpfr.sh +++ b/scripts/build/companion_libs/110-mpfr.sh @@ -122,12 +122,12 @@ do_mpfr_backend() { --enable-static CT_DoLog EXTRA "Building MPFR" - CT_DoExecLog ALL make ${JOBSFLAGS} + CT_DoExecLog ALL make ${CT_JOBSFLAGS} if [ "${CT_COMPLIBS_CHECK}" = "y" ]; then if [ "${host}" = "${CT_BUILD}" ]; then CT_DoLog EXTRA "Checking MPFR" - CT_DoExecLog ALL make ${JOBSFLAGS} -s check + CT_DoExecLog ALL make ${CT_JOBSFLAGS} -s check else # Cannot run host binaries on build in a canadian cross CT_DoLog EXTRA "Skipping check for MPFR on the host" diff --git a/scripts/build/companion_libs/121-isl.sh b/scripts/build/companion_libs/121-isl.sh index d96e9ce..8b1b720 100644 --- a/scripts/build/companion_libs/121-isl.sh +++ b/scripts/build/companion_libs/121-isl.sh @@ -110,12 +110,12 @@ do_isl_backend() { --with-clang=no CT_DoLog EXTRA "Building ISL" - CT_DoExecLog ALL make ${JOBSFLAGS} + CT_DoExecLog ALL make ${CT_JOBSFLAGS} if [ "${CT_COMPLIBS_CHECK}" = "y" ]; then if [ "${host}" = "${CT_BUILD}" ]; then CT_DoLog EXTRA "Checking ISL" - CT_DoExecLog ALL make ${JOBSFLAGS} -s check + CT_DoExecLog ALL make ${CT_JOBSFLAGS} -s check else # Cannot run host binaries on build in a canadian cross CT_DoLog EXTRA "Skipping check for ISL on the host" diff --git a/scripts/build/companion_libs/130-cloog.sh b/scripts/build/companion_libs/130-cloog.sh index e0f89eb..9ee897a 100644 --- a/scripts/build/companion_libs/130-cloog.sh +++ b/scripts/build/companion_libs/130-cloog.sh @@ -101,12 +101,12 @@ do_cloog_backend() { "${cloog_opts[@]}" CT_DoLog EXTRA "Building CLooG" - CT_DoExecLog ALL make ${JOBSFLAGS} + CT_DoExecLog ALL make ${CT_JOBSFLAGS} if [ "${CT_COMPLIBS_CHECK}" = "y" ]; then if [ "${host}" = "${CT_BUILD}" ]; then CT_DoLog EXTRA "Checking CLooG" - CT_DoExecLog ALL make ${JOBSFLAGS} -s check + CT_DoExecLog ALL make ${CT_JOBSFLAGS} -s check else # Cannot run host binaries on build in a canadian cross CT_DoLog EXTRA "Skipping check for CLooG on the host" diff --git a/scripts/build/companion_libs/140-mpc.sh b/scripts/build/companion_libs/140-mpc.sh index 3136ab4..2166ef1 100644 --- a/scripts/build/companion_libs/140-mpc.sh +++ b/scripts/build/companion_libs/140-mpc.sh @@ -94,12 +94,12 @@ do_mpc_backend() { --enable-static CT_DoLog EXTRA "Building MPC" - CT_DoExecLog ALL make ${JOBSFLAGS} + CT_DoExecLog ALL make ${CT_JOBSFLAGS} if [ "${CT_COMPLIBS_CHECK}" = "y" ]; then if [ "${host}" = "${CT_BUILD}" ]; then CT_DoLog EXTRA "Checking MPC" - CT_DoExecLog ALL make ${JOBSFLAGS} -s check + CT_DoExecLog ALL make ${CT_JOBSFLAGS} -s check else # Cannot run host binaries on build in a canadian cross CT_DoLog EXTRA "Skipping check for MPC on the host" diff --git a/scripts/build/companion_libs/210-expat.sh b/scripts/build/companion_libs/210-expat.sh index d2ca6a0..68667f6 100644 --- a/scripts/build/companion_libs/210-expat.sh +++ b/scripts/build/companion_libs/210-expat.sh @@ -103,7 +103,7 @@ do_expat_backend() { "${extra_config[@]}" CT_DoLog EXTRA "Building expat" - CT_DoExecLog ALL make ${JOBSFLAGS} + CT_DoExecLog ALL make ${CT_JOBSFLAGS} CT_DoLog EXTRA "Installing expat" CT_DoExecLog ALL make install DESTDIR="${destdir}" } diff --git a/scripts/build/companion_libs/220-ncurses.sh b/scripts/build/companion_libs/220-ncurses.sh index decfa9e..f1fcd1a 100644 --- a/scripts/build/companion_libs/220-ncurses.sh +++ b/scripts/build/companion_libs/220-ncurses.sh @@ -174,7 +174,7 @@ do_ncurses_backend() { # it also builds ncurses anyway, and dedicated targets (install.includes and # install.progs) do not do well with parallel make (-jX). CT_DoLog EXTRA "Building ncurses" - CT_DoExecLog ALL make ${JOBSFLAGS} + CT_DoExecLog ALL make ${CT_JOBSFLAGS} # STRIPPROG is handled by our wrapper around install. CT_DoLog EXTRA "Installing ncurses" diff --git a/scripts/build/companion_libs/320-libiconv.sh b/scripts/build/companion_libs/320-libiconv.sh index ad571a9..9748ba2 100644 --- a/scripts/build/companion_libs/320-libiconv.sh +++ b/scripts/build/companion_libs/320-libiconv.sh @@ -100,7 +100,7 @@ do_libiconv_backend() { "${extra_config[@]}" \ CT_DoLog EXTRA "Building libiconv" - CT_DoExecLog ALL make CC="${host}-gcc ${cflags}" ${JOBSFLAGS} + CT_DoExecLog ALL make CC="${host}-gcc ${cflags}" ${CT_JOBSFLAGS} CT_DoLog EXTRA "Installing libiconv" CT_DoExecLog ALL make install CC="${host}-gcc ${cflags}" diff --git a/scripts/build/companion_libs/330-gettext.sh b/scripts/build/companion_libs/330-gettext.sh index f3f1497..149d7d7 100644 --- a/scripts/build/companion_libs/330-gettext.sh +++ b/scripts/build/companion_libs/330-gettext.sh @@ -131,7 +131,7 @@ do_gettext_backend() { "${extra_config[@]}" CT_DoLog EXTRA "Building gettext" - CT_DoExecLog ALL make ${JOBSFLAGS} + CT_DoExecLog ALL make ${CT_JOBSFLAGS} CT_DoLog EXTRA "Installing gettext" CT_DoExecLog ALL make install diff --git a/scripts/build/debug/300-gdb.sh b/scripts/build/debug/300-gdb.sh index a9aae30..9139331 100644 --- a/scripts/build/debug/300-gdb.sh +++ b/scripts/build/debug/300-gdb.sh @@ -67,7 +67,7 @@ do_debug_gdb_build() if [ "${CT_BUILD_MANUALS}" = "y" ]; then CT_DoLog EXTRA "Building and installing the cross-GDB manuals" - CT_DoExecLog ALL make ${JOBSFLAGS} pdf html + CT_DoExecLog ALL make ${CT_JOBSFLAGS} pdf html CT_DoExecLog ALL make install-{pdf,html}-gdb fi @@ -278,7 +278,7 @@ do_gdb_backend() "${extra_config[@]}" \ CT_DoLog EXTRA "Building ${buildtype} gdb" - CT_DoExecLog ALL make ${JOBSFLAGS} + CT_DoExecLog ALL make ${CT_JOBSFLAGS} CT_DoLog EXTRA "Installing ${buildtype} gdb" CT_DoExecLog ALL make install ${destdir:+DESTDIR="${destdir}"} diff --git a/scripts/build/libc/avr-libc.sh b/scripts/build/libc/avr-libc.sh index ce63b4a..34eb0f5 100644 --- a/scripts/build/libc/avr-libc.sh +++ b/scripts/build/libc/avr-libc.sh @@ -20,7 +20,7 @@ avr_libc_post_cc() "${CT_LIBC_AVR_LIBC_EXTRA_CONFIG_ARRAY[@]}" CT_DoLog EXTRA "Building C library" - CT_DoExecLog ALL make ${JOBSFLAGS} + CT_DoExecLog ALL make ${CT_JOBSFLAGS} CT_DoLog EXTRA "Installing C library" CT_DoExecLog ALL make install diff --git a/scripts/build/libc/glibc.sh b/scripts/build/libc/glibc.sh index aebc898..221752d 100644 --- a/scripts/build/libc/glibc.sh +++ b/scripts/build/libc/glibc.sh @@ -321,7 +321,7 @@ glibc_backend_once() # use the 'install-headers' makefile target to install the # headers - CT_DoExecLog ALL make ${JOBSFLAGS} \ + CT_DoExecLog ALL make ${CT_JOBSFLAGS} \ install_root=${multi_root} \ install-bootstrap-headers=yes \ "${extra_make_args[@]}" \ @@ -371,7 +371,7 @@ glibc_backend_once() # there are a few object files needed to link shared libraries, # which we build and install by hand CT_DoExecLog ALL mkdir -p "${startfiles_dir}" - CT_DoExecLog ALL make ${JOBSFLAGS} \ + CT_DoExecLog ALL make ${CT_JOBSFLAGS} \ "${extra_make_args[@]}" \ csu/subdir_lib CT_DoExecLog ALL cp csu/crt1.o csu/crti.o csu/crtn.o \ @@ -392,12 +392,12 @@ glibc_backend_once() if [ "${libc_mode}" = "final" ]; then CT_DoLog EXTRA "Building C library" - CT_DoExecLog ALL make ${JOBSFLAGS} \ + CT_DoExecLog ALL make ${CT_JOBSFLAGS} \ "${extra_make_args[@]}" \ all CT_DoLog EXTRA "Installing C library" - CT_DoExecLog ALL make ${JOBSFLAGS} \ + CT_DoExecLog ALL make ${CT_JOBSFLAGS} \ "${extra_make_args[@]}" \ install_root="${multi_root}" \ install @@ -407,7 +407,7 @@ glibc_backend_once() # last multilib target. If it's not multilib, it will happen on the # only target. CT_DoLog EXTRA "Building and installing the C library manual" - # Omit JOBSFLAGS as GLIBC has problems building the + # Omit CT_JOBSFLAGS as GLIBC has problems building the # manuals in parallel CT_DoExecLog ALL make pdf html CT_DoExecLog ALL mkdir -p ${CT_PREFIX_DIR}/share/doc @@ -546,7 +546,7 @@ glibc_locales() "${extra_config[@]}" CT_DoLog EXTRA "Building C library localedef" - CT_DoExecLog ALL make ${JOBSFLAGS} + CT_DoExecLog ALL make ${CT_JOBSFLAGS} # The target's endianness and uint32_t alignment should be passed as options # to localedef, but glibc's localedef does not support these options, which @@ -554,7 +554,7 @@ glibc_locales() # only if it has the same endianness and uint32_t alignment as the host's. CT_DoLog EXTRA "Installing C library locales" - CT_DoExecLog ALL make ${JOBSFLAGS} \ + CT_DoExecLog ALL make ${CT_JOBSFLAGS} \ install_root="${CT_SYSROOT_DIR}" \ localedata/install-locales } diff --git a/scripts/build/libc/mingw-w64.sh b/scripts/build/libc/mingw-w64.sh index a5b89d1..683f8be 100644 --- a/scripts/build/libc/mingw-w64.sh +++ b/scripts/build/libc/mingw-w64.sh @@ -196,7 +196,7 @@ mingw_w64_main() # mingw-w64-crt has a missing dependency occasionally breaking the # parallel build. See https://github.com/crosstool-ng/crosstool-ng/issues/246 - # Do not pass ${JOBSFLAGS} - build serially. + # Do not pass ${CT_JOBSFLAGS} - build serially. CT_DoLog EXTRA "Building mingw-w64-crt" CT_DoExecLog ALL make diff --git a/scripts/build/libc/musl.sh b/scripts/build/libc/musl.sh index 63d6804..807b3bd 100644 --- a/scripts/build/libc/musl.sh +++ b/scripts/build/libc/musl.sh @@ -128,7 +128,7 @@ musl_backend_once() { "${multi_root}${multilib_dir}/libc.so" CT_DoLog EXTRA "Building C library" - CT_DoExecLog ALL make ${JOBSFLAGS} + CT_DoExecLog ALL make ${CT_JOBSFLAGS} CT_DoLog EXTRA "Installing C library" CT_DoExecLog ALL make DESTDIR="${multi_root}" install diff --git a/scripts/build/libc/newlib.sh b/scripts/build/libc/newlib.sh index 69d2b46..95ab791 100644 --- a/scripts/build/libc/newlib.sh +++ b/scripts/build/libc/newlib.sh @@ -108,7 +108,7 @@ ENABLE_TARGET_OPTSPACE:target-optspace "${CT_LIBC_NEWLIB_EXTRA_CONFIG_ARRAY[@]}" CT_DoLog EXTRA "Building C library" - CT_DoExecLog ALL make ${JOBSFLAGS} + CT_DoExecLog ALL make ${CT_JOBSFLAGS} CT_DoLog EXTRA "Installing C library" CT_DoExecLog ALL make install diff --git a/scripts/build/libc/uClibc.sh b/scripts/build/libc/uClibc.sh index fbee4aa..7600316 100644 --- a/scripts/build/libc/uClibc.sh +++ b/scripts/build/libc/uClibc.sh @@ -44,7 +44,7 @@ uClibc_backend_once() local libc_mode local multi_dir multi_os_dir multi_root multi_flags multi_index multi_count local multilib_dir startfiles_dir - local jflag=${CT_LIBC_UCLIBC_PARALLEL:+${JOBSFLAGS}} + local jflag=${CT_LIBC_UCLIBC_PARALLEL:+${CT_JOBSFLAGS}} local -a make_args local extra_cflags f cfg_cflags cf local hdr_install_subdir diff --git a/scripts/crosstool-NG.sh b/scripts/crosstool-NG.sh index 6014e4a..31942b1 100644 --- a/scripts/crosstool-NG.sh +++ b/scripts/crosstool-NG.sh @@ -578,7 +578,7 @@ if [ -z "${CT_RESTART}" ]; then CT_DoLog DEBUG "LDFLAGS for host compiler: '${CT_LDFLAGS_FOR_HOST}'" # And help make go faster - JOBSFLAGS= + CT_JOBSFLAGS= # Override the configured jobs with what's been given on the command line if [ -n "${CT_JOBS}" ]; then if [ ! -z "`echo "${CT_JOBS}" | ${sed} 's/[0-9]//g'`" ]; then @@ -589,9 +589,9 @@ if [ -z "${CT_RESTART}" ]; then # Use the number of processors+1 when automatically setting the number of # parallel jobs. AUTO_JOBS=$[ BUILD_NCPUS + 1 ] - [ ${CT_PARALLEL_JOBS} -eq 0 ] && JOBSFLAGS="${JOBSFLAGS} -j${AUTO_JOBS}" - [ ${CT_PARALLEL_JOBS} -gt 0 ] && JOBSFLAGS="${JOBSFLAGS} -j${CT_PARALLEL_JOBS}" - JOBSFLAGS="${JOBSFLAGS} -l${CT_LOAD}" + [ ${CT_PARALLEL_JOBS} -eq 0 ] && CT_JOBSFLAGS="${CT_JOBSFLAGS} -j${AUTO_JOBS}" + [ ${CT_PARALLEL_JOBS} -gt 0 ] && CT_JOBSFLAGS="${CT_JOBSFLAGS} -j${CT_PARALLEL_JOBS}" + CT_JOBSFLAGS="${CT_JOBSFLAGS} -l${CT_LOAD}" # Override 'download only' option [ -n "${CT_SOURCE}" ] && CT_ONLY_DOWNLOAD=y -- cgit v0.10.2-6-g49f6