| Andrew Geissler | 82c905d | 2020-04-13 13:39:40 -0500 | [diff] [blame] | 1 | vim: do not adjust script pathnames |
| 2 | |
| 3 | When cross-compiling, we do not want to reference the host versions of |
| 4 | things like perl and awk. |
| 5 | |
| 6 | Upstream-Status: Pending |
| 7 | |
| 8 | Signed-off-by: Joe Slater <joe.slater@windriver.com> |
| 9 | |
| 10 | --- a/src/Makefile |
| 11 | +++ b/src/Makefile |
| 12 | @@ -2507,11 +2507,14 @@ installtools: $(TOOLS) $(DESTDIR)$(exec_ |
| 13 | rm -rf $$cvs; \ |
| 14 | fi |
| 15 | -chmod $(FILEMOD) $(DEST_TOOLS)/* |
| 16 | -# replace the path in some tools |
| 17 | + |
| 18 | +# replace the path in some tools, but not when cross-compiling |
| 19 | +ifneq ($(CROSS_COMPILING),1) |
| 20 | perlpath=`./which.sh perl` && sed -e "s+/usr/bin/perl+$$perlpath+" $(TOOLSSOURCE)/efm_perl.pl >$(DEST_TOOLS)/efm_perl.pl |
| 21 | awkpath=`./which.sh nawk` && sed -e "s+/usr/bin/nawk+$$awkpath+" $(TOOLSSOURCE)/mve.awk >$(DEST_TOOLS)/mve.awk; if test -z "$$awkpath"; then \ |
| 22 | awkpath=`./which.sh gawk` && sed -e "s+/usr/bin/nawk+$$awkpath+" $(TOOLSSOURCE)/mve.awk >$(DEST_TOOLS)/mve.awk; if test -z "$$awkpath"; then \ |
| 23 | awkpath=`./which.sh awk` && sed -e "s+/usr/bin/nawk+$$awkpath+" $(TOOLSSOURCE)/mve.awk >$(DEST_TOOLS)/mve.awk; fi; fi |
| 24 | +endif |
| 25 | -chmod $(SCRIPTMOD) `grep -l "^#!" $(DEST_TOOLS)/*` |
| 26 | |
| 27 | # install the language specific files for tools, if they were unpacked |