diff options
author | Alexey Neyman <stilor@att.net> | 2016-11-22 18:02:04 (GMT) |
---|---|---|
committer | GitHub <noreply@github.com> | 2016-11-22 18:02:04 (GMT) |
commit | 0946ce59a09609b743b7dba40f7212778011f286 (patch) | |
tree | aa666685885104ed985b4c743ad3222968e7ae54 /scripts/build/companion_libs | |
parent | 3eb2e351f02d82fad255a9e6433c4c4d659c5de0 (diff) | |
parent | 87bfd55b3b5329c7f306fa291ca5e0950a2c9da1 (diff) |
Merge pull request #479 from stilor/gmake-link-fix
Gmake link fix
Diffstat (limited to 'scripts/build/companion_libs')
-rw-r--r-- | scripts/build/companion_libs/100-gmp.sh | 6 | ||||
-rw-r--r-- | scripts/build/companion_libs/110-mpfr.sh | 10 | ||||
-rw-r--r-- | scripts/build/companion_libs/121-isl.sh | 6 | ||||
-rw-r--r-- | scripts/build/companion_libs/130-cloog.sh | 6 | ||||
-rw-r--r-- | scripts/build/companion_libs/140-mpc.sh | 6 | ||||
-rw-r--r-- | scripts/build/companion_libs/200-libelf.sh | 4 | ||||
-rwxr-xr-x | scripts/build/companion_libs/210-expat.sh | 4 | ||||
-rw-r--r-- | scripts/build/companion_libs/220-ncurses.sh | 4 | ||||
-rw-r--r-- | scripts/build/companion_libs/320-libiconv.sh | 4 | ||||
-rw-r--r-- | scripts/build/companion_libs/330-gettext.sh | 4 |
10 files changed, 27 insertions, 27 deletions
diff --git a/scripts/build/companion_libs/100-gmp.sh b/scripts/build/companion_libs/100-gmp.sh index b727f2b..f0df3d1 100644 --- a/scripts/build/companion_libs/100-gmp.sh +++ b/scripts/build/companion_libs/100-gmp.sh @@ -103,15 +103,15 @@ do_gmp_backend() { "${extra_config}" CT_DoLog EXTRA "Building GMP" - CT_DoExecLog ALL ${make} ${JOBSFLAGS} + CT_DoExecLog ALL make ${JOBSFLAGS} if [ "${CT_COMPLIBS_CHECK}" = "y" ]; then CT_DoLog EXTRA "Checking GMP" - CT_DoExecLog ALL ${make} ${JOBSFLAGS} -s check + CT_DoExecLog ALL make ${JOBSFLAGS} -s check fi CT_DoLog EXTRA "Installing GMP" - CT_DoExecLog ALL ${make} install + CT_DoExecLog ALL make install } fi # CT_GMP diff --git a/scripts/build/companion_libs/110-mpfr.sh b/scripts/build/companion_libs/110-mpfr.sh index 0d024d7..bcbe90f 100644 --- a/scripts/build/companion_libs/110-mpfr.sh +++ b/scripts/build/companion_libs/110-mpfr.sh @@ -53,12 +53,12 @@ do_mpfr_extract() { # See: http://sourceware.org/ml/crossgcc/2008-11/msg00046.html # and: http://sourceware.org/ml/crossgcc/2008-11/msg00048.html libtoolize_opt= - case "$(${libtoolize} --version |head -n 1 |${awk} '{ print $(NF); }')" in + case "$(libtoolize --version |head -n 1 |awk '{ print $(NF); }')" in 0.*) ;; 1.*) ;; *) libtoolize_opt=-i;; esac - CT_DoExecLog ALL ${libtoolize} -f ${libtoolize_opt} + CT_DoExecLog ALL libtoolize -f ${libtoolize_opt} touch .autotools.ct-ng fi CT_Popd @@ -146,15 +146,15 @@ do_mpfr_backend() { --enable-static CT_DoLog EXTRA "Building MPFR" - CT_DoExecLog ALL ${make} ${JOBSFLAGS} + CT_DoExecLog ALL make ${JOBSFLAGS} if [ "${CT_COMPLIBS_CHECK}" = "y" ]; then CT_DoLog EXTRA "Checking MPFR" - CT_DoExecLog ALL ${make} ${JOBSFLAGS} -s check + CT_DoExecLog ALL make ${JOBSFLAGS} -s check fi CT_DoLog EXTRA "Installing MPFR" - CT_DoExecLog ALL ${make} install + CT_DoExecLog ALL make install } fi # CT_MPFR diff --git a/scripts/build/companion_libs/121-isl.sh b/scripts/build/companion_libs/121-isl.sh index a93d1aa..823dbd5 100644 --- a/scripts/build/companion_libs/121-isl.sh +++ b/scripts/build/companion_libs/121-isl.sh @@ -122,15 +122,15 @@ do_isl_backend() { --with-clang=no CT_DoLog EXTRA "Building ISL" - CT_DoExecLog ALL ${make} ${JOBSFLAGS} + CT_DoExecLog ALL make ${JOBSFLAGS} if [ "${CT_COMPLIBS_CHECK}" = "y" ]; then CT_DoLog EXTRA "Checking ISL" - CT_DoExecLog ALL ${make} ${JOBSFLAGS} -s check + CT_DoExecLog ALL make ${JOBSFLAGS} -s check fi CT_DoLog EXTRA "Installing ISL" - CT_DoExecLog ALL ${make} install + CT_DoExecLog ALL make install } fi # CT_ISL diff --git a/scripts/build/companion_libs/130-cloog.sh b/scripts/build/companion_libs/130-cloog.sh index 2376570..5504ac2 100644 --- a/scripts/build/companion_libs/130-cloog.sh +++ b/scripts/build/companion_libs/130-cloog.sh @@ -109,15 +109,15 @@ do_cloog_backend() { "${cloog_opts[@]}" CT_DoLog EXTRA "Building CLooG" - CT_DoExecLog ALL ${make} ${JOBSFLAGS} + CT_DoExecLog ALL make ${JOBSFLAGS} if [ "${CT_COMPLIBS_CHECK}" = "y" ]; then CT_DoLog EXTRA "Checking CLooG" - CT_DoExecLog ALL ${make} ${JOBSFLAGS} -s check + CT_DoExecLog ALL make ${JOBSFLAGS} -s check fi CT_DoLog EXTRA "Installing CLooG" - CT_DoExecLog ALL ${make} install + CT_DoExecLog ALL make install } fi # CT_CLOOG diff --git a/scripts/build/companion_libs/140-mpc.sh b/scripts/build/companion_libs/140-mpc.sh index f753a27..f68e18e 100644 --- a/scripts/build/companion_libs/140-mpc.sh +++ b/scripts/build/companion_libs/140-mpc.sh @@ -97,15 +97,15 @@ do_mpc_backend() { --enable-static CT_DoLog EXTRA "Building MPC" - CT_DoExecLog ALL ${make} ${JOBSFLAGS} + CT_DoExecLog ALL make ${JOBSFLAGS} if [ "${CT_COMPLIBS_CHECK}" = "y" ]; then CT_DoLog EXTRA "Checking MPC" - CT_DoExecLog ALL ${make} ${JOBSFLAGS} -s check + CT_DoExecLog ALL make ${JOBSFLAGS} -s check fi CT_DoLog EXTRA "Installing MPC" - CT_DoExecLog ALL ${make} install + CT_DoExecLog ALL make install } fi # CT_MPC diff --git a/scripts/build/companion_libs/200-libelf.sh b/scripts/build/companion_libs/200-libelf.sh index 529bba2..e00fa16 100644 --- a/scripts/build/companion_libs/200-libelf.sh +++ b/scripts/build/companion_libs/200-libelf.sh @@ -132,7 +132,7 @@ do_libelf_backend() { "${extra_config[@]}" CT_DoLog EXTRA "Building libelf" - CT_DoExecLog ALL ${make} + CT_DoExecLog ALL make CT_DoLog EXTRA "Installing libelf" @@ -142,7 +142,7 @@ do_libelf_backend() { destdir= fi - CT_DoExecLog ALL ${make} instroot="${destdir}" install + CT_DoExecLog ALL make instroot="${destdir}" install } fi # CT_LIBELF || CT_LIBELF_TARGET diff --git a/scripts/build/companion_libs/210-expat.sh b/scripts/build/companion_libs/210-expat.sh index 7801d33..e627673 100755 --- a/scripts/build/companion_libs/210-expat.sh +++ b/scripts/build/companion_libs/210-expat.sh @@ -93,9 +93,9 @@ do_expat_backend() { "${extra_config[@]}" CT_DoLog EXTRA "Building expat" - CT_DoExecLog ALL ${make} ${JOBSFLAGS} + CT_DoExecLog ALL make ${JOBSFLAGS} CT_DoLog EXTRA "Installing expat" - CT_DoExecLog ALL ${make} install INSTALL_ROOT="${destdir}" + CT_DoExecLog ALL make install INSTALL_ROOT="${destdir}" } fi diff --git a/scripts/build/companion_libs/220-ncurses.sh b/scripts/build/companion_libs/220-ncurses.sh index 18cd4d9..78a5513 100644 --- a/scripts/build/companion_libs/220-ncurses.sh +++ b/scripts/build/companion_libs/220-ncurses.sh @@ -148,9 +148,9 @@ 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 ${JOBSFLAGS} CT_DoLog EXTRA "Installing ncurses" - CT_DoExecLog ALL ${make} install + CT_DoExecLog ALL make install } fi diff --git a/scripts/build/companion_libs/320-libiconv.sh b/scripts/build/companion_libs/320-libiconv.sh index 0c9e5cf..2f1b209 100644 --- a/scripts/build/companion_libs/320-libiconv.sh +++ b/scripts/build/companion_libs/320-libiconv.sh @@ -106,10 +106,10 @@ 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}" ${JOBSFLAGS} CT_DoLog EXTRA "Installing libiconv" - CT_DoExecLog ALL ${make} install CC="${host}-gcc ${cflags}" + CT_DoExecLog ALL make install CC="${host}-gcc ${cflags}" } fi diff --git a/scripts/build/companion_libs/330-gettext.sh b/scripts/build/companion_libs/330-gettext.sh index 7a8755e..6be51bf 100644 --- a/scripts/build/companion_libs/330-gettext.sh +++ b/scripts/build/companion_libs/330-gettext.sh @@ -128,10 +128,10 @@ do_gettext_backend() { "${extra_config[@]}" CT_DoLog EXTRA "Building gettext" - CT_DoExecLog ALL ${make} ${JOBSFLAGS} + CT_DoExecLog ALL make ${JOBSFLAGS} CT_DoLog EXTRA "Installing gettext" - CT_DoExecLog ALL ${make} install + CT_DoExecLog ALL make install } fi |