diff options
| author |   Alexey Neyman <stilor@att.net> | 2016-11-21 07:50:17 (GMT) |
|---|---|---|
| committer | Alexey Neyman <stilor@att.net> | 2016-11-21 07:50:17 (GMT) |
| commit | 488b27f58bfdb3c9c523448acfa17b51325fec03 (patch) | |
| tree | 24f799a43b479bc65a61d317d76c6127fc2fa320 /scripts/build/libc/mingw.sh | |
| parent | 6cb9e62f6cc680935ad1b759018e214582b54550 (diff) | |
Partially revert 6f8e89cb5ca061e899bf3feaaf3fecf30d366c3e.
The referenced commit replaced 'make' with '${make}' everywhere. This is
wrong for at least the utilities that we may build as companion tools
(make, libtool): this will always invoke the version detected by configure
by supplying the absolute path. In other words, the wrappers in
.build/tools/bin are not fallbacks - they are either temporary (in case
a respective companion tool is built) or permanent redirectors.
This is the reason why the PATH= has .build/*/buildtools/bin at higher
precedence than .build/tools/bin; the latter has the versions detected by
configure and the former has the versions built as companion tools.
Revert the rest of the gang (grep/sed/...) for consistency. After all,
we may decide to supply some of them as well (awk, for instance).
Signed-off-by: Alexey Neyman <stilor@att.net>
Diffstat (limited to 'scripts/build/libc/mingw.sh')
| -rw-r--r-- | scripts/build/libc/mingw.sh | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/scripts/build/libc/mingw.sh b/scripts/build/libc/mingw.sh index e2b781d..705f8c9 100644 --- a/scripts/build/libc/mingw.sh +++ b/scripts/build/libc/mingw.sh @@ -55,10 +55,10 @@ do_libc_start_files() { "${sdk_opts[@]}" CT_DoLog EXTRA "Compile Headers" - CT_DoExecLog ALL ${make} + CT_DoExecLog ALL make CT_DoLog EXTRA "Installing Headers" - CT_DoExecLog ALL ${make} install DESTDIR=${CT_SYSROOT_DIR} + CT_DoExecLog ALL make install DESTDIR=${CT_SYSROOT_DIR} CT_Popd @@ -104,10 +104,10 @@ do_libc() { # parallel build. See https://github.com/crosstool-ng/crosstool-ng/issues/246 # Do not pass ${JOBSFLAGS} - build serially. CT_DoLog EXTRA "Building mingw-w64-crt" - CT_DoExecLog ALL ${make} + CT_DoExecLog ALL make CT_DoLog EXTRA "Installing mingw-w64-crt" - CT_DoExecLog ALL ${make} install DESTDIR=${CT_SYSROOT_DIR} + CT_DoExecLog ALL make install DESTDIR=${CT_SYSROOT_DIR} CT_EndStep @@ -135,10 +135,10 @@ do_pthreads() { --host=${CT_TARGET} \ CT_DoLog EXTRA "Building mingw-w64-winpthreads" - CT_DoExecLog ALL ${make} ${JOBSFLAGS} + CT_DoExecLog ALL make ${JOBSFLAGS} CT_DoLog EXTRA "Installing mingw-w64-winpthreads" - CT_DoExecLog ALL ${make} install DESTDIR=${CT_SYSROOT_DIR} + CT_DoExecLog ALL make install DESTDIR=${CT_SYSROOT_DIR} CT_EndStep } |