diff options
author | Bryan Hundven <bryanhundven@gmail.com> | 2015-11-17 10:48:09 (GMT) |
---|---|---|
committer | Bryan Hundven <bryanhundven@gmail.com> | 2015-11-17 10:48:09 (GMT) |
commit | 6f8e89cb5ca061e899bf3feaaf3fecf30d366c3e (patch) | |
tree | 9eb19260dd694fa6b4852c46e3f0a93939db9a24 /scripts/build/companion_libs/110-mpfr.sh | |
parent | 6ac8e31a519f41af7838bb5261e0fe989fb428bd (diff) |
consistency: Use exported variables of required tools
We check for apps:
* make
* sed
* grep
* awk
* libtool/libtoolize
* install
* patch
* and more
...during configure. Our scripts should be consistent about using the
variables that define where the found tool was found.
Of course, we do hard-link these tools in buildtools, but that should be
a backup for the components we are building. Our scripts should always
use the tools we find.
Signed-off-by: Bryan Hundven <bryanhundven@gmail.com>
Diffstat (limited to 'scripts/build/companion_libs/110-mpfr.sh')
-rw-r--r-- | scripts/build/companion_libs/110-mpfr.sh | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/scripts/build/companion_libs/110-mpfr.sh b/scripts/build/companion_libs/110-mpfr.sh index bcbe90f..0d024d7 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 |