This is the mail archive of the
libc-alpha@sourceware.org
mailing list for the glibc project.
Re: Use $(run-program-prefix) in more shell script tests
On Wed, Oct 24, 2012 at 6:44 AM, Andreas Schwab <schwab@linux-m68k.org> wrote:
> "H.J. Lu" <hjl.tools@gmail.com> writes:
>
>> There is no need to use ${SHELL} since there is "#! /bin/sh".
>> Tested on x86-64. OK to install?
>
> Take a look at 58b668a.
>
The patch is ineffective and no-op:
1. We never subst SHELL in config.make.
2. We never export SHELL from make.
This patch fixes those. Tested on x86-64. OK
to install?
Thanks.
--
H.J.
2012-10-24 H.J. Lu <hongjiu.lu@intel.com>
* config.make.in (SHELL): New variable.
* iconvdata/Makefile ($(objpfx)tst-tables.out): Pass SHELL
environment to tst-tables.sh.
diff --git a/config.make.in b/config.make.in
index c22acf4..8cfd30e 100644
--- a/config.make.in
+++ b/config.make.in
@@ -133,6 +133,7 @@ MSGFMT = @MSGFMT@
# Script execution tools.
BASH = @BASH_SHELL@
KSH = @KSH@
+SHELL = @SHELL@
AWK = @AWK@
PERL = @PERL@
diff --git a/iconvdata/Makefile b/iconvdata/Makefile
index 2840cff..07e4076 100644
--- a/iconvdata/Makefile
+++ b/iconvdata/Makefile
@@ -304,6 +304,7 @@ $(objpfx)iconv-test.out: run-iconv-test.sh
$(objpfx)gconv-modules \
$(objpfx)tst-tables.out: tst-tables.sh $(objpfx)gconv-modules \
$(addprefix $(objpfx),$(modules.so)) \
$(objpfx)tst-table-from $(objpfx)tst-table-to
+ SHELL=$(SHELL) \
$(SHELL) $< $(common-objpfx) $(common-objpfx)iconvdata/ \
'$(run-program-prefix)' > $@