diff options
| author | Alexey Neyman <stilor@att.net> | 2016-11-20 23:50:17 -0800 |
|---|---|---|
| committer | Alexey Neyman <stilor@att.net> | 2016-11-20 23:50:17 -0800 |
| commit | 488b27f58bfdb3c9c523448acfa17b51325fec03 (patch) | |
| tree | 24f799a43b479bc65a61d317d76c6127fc2fa320 /scripts/build/libc/musl.sh | |
| parent | 6cb9e62f6cc680935ad1b759018e214582b54550 (diff) | |
| download | crosstool-ng-488b27f58bfdb3c9c523448acfa17b51325fec03.tar.gz crosstool-ng-488b27f58bfdb3c9c523448acfa17b51325fec03.tar.bz2 crosstool-ng-488b27f58bfdb3c9c523448acfa17b51325fec03.zip | |
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/musl.sh')
| -rw-r--r-- | scripts/build/libc/musl.sh | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/scripts/build/libc/musl.sh b/scripts/build/libc/musl.sh index 2a0c04fd..acd14c2c 100644 --- a/scripts/build/libc/musl.sh +++ b/scripts/build/libc/musl.sh @@ -120,9 +120,9 @@ do_libc_backend_once() { if [ "${libc_mode}" = "startfiles" ]; then CT_DoLog EXTRA "Installing C library headers" - CT_DoExecLog ALL ${make} DESTDIR="${multi_root}" install-headers + CT_DoExecLog ALL make DESTDIR="${multi_root}" install-headers CT_DoLog EXTRA "Building C library start files" - CT_DoExecLog ALL ${make} DESTDIR="${multi_root}" \ + CT_DoExecLog ALL make DESTDIR="${multi_root}" \ obj/crt/crt1.o obj/crt/crti.o obj/crt/crtn.o CT_DoLog EXTRA "Installing C library start files" CT_DoExecLog ALL cp -av obj/crt/crt*.o "${multi_root}${multilib_dir}" @@ -137,10 +137,10 @@ do_libc_backend_once() { "${multi_root}${multilib_dir}/libc.so" CT_DoLog EXTRA "Building C library" - CT_DoExecLog ALL ${make} ${JOBSFLAGS} + CT_DoExecLog ALL make ${JOBSFLAGS} CT_DoLog EXTRA "Installing C library" - CT_DoExecLog ALL ${make} DESTDIR="${multi_root}" install + CT_DoExecLog ALL make DESTDIR="${multi_root}" install # Convert /lib/ld-* symlinks to relative paths so that they are valid # both on the host and on the target. |