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/companion_libs/200-libelf.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/companion_libs/200-libelf.sh')
| -rw-r--r-- | scripts/build/companion_libs/200-libelf.sh | 4 |
1 files changed, 2 insertions, 2 deletions
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 |