* [PATCH] Cygwin: Launch cygmagic with bash, not sh
@ 2020-12-07 6:17 Mark Geisert
2020-12-07 9:41 ` Corinna Vinschen
2020-12-08 14:50 ` Jon Turney
0 siblings, 2 replies; 3+ messages in thread
From: Mark Geisert @ 2020-12-07 6:17 UTC (permalink / raw)
To: cygwin-patches
On some systems /bin/sh is not /bin/bash and cygmagic has bash-isms in
it. So even though cygmagic has a /bin/bash shebang, it also needs to be
launched with bash from within Makefile.in.
---
winsup/cygwin/Makefile.in | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/winsup/cygwin/Makefile.in b/winsup/cygwin/Makefile.in
index b15c746cf..a840f2b83 100644
--- a/winsup/cygwin/Makefile.in
+++ b/winsup/cygwin/Makefile.in
@@ -683,10 +683,10 @@ globals.h: mkglobals_h globals.cc
${DLL_OFILES} ${LIBCOS}: globals.h $(srcdir)/$(TLSOFFSETS_H)
shared_info_magic.h: cygmagic shared_info.h
- /bin/sh $(word 1,$^) $@ "${COMPILE.cc} -E -x c++" $(word 2,$^) SHARED_MAGIC 'class shared_info' USER_MAGIC 'class user_info'
+ /bin/bash $(word 1,$^) $@ "${COMPILE.cc} -E -x c++" $(word 2,$^) SHARED_MAGIC 'class shared_info' USER_MAGIC 'class user_info'
child_info_magic.h: cygmagic child_info.h
- /bin/sh $(word 1,$^) $@ "${COMPILE.cc} -E -x c++" $(word 2,$^) CHILD_INFO_MAGIC 'class child_info'
+ /bin/bash $(word 1,$^) $@ "${COMPILE.cc} -E -x c++" $(word 2,$^) CHILD_INFO_MAGIC 'class child_info'
dcrt0.o sigproc.o: child_info_magic.h
--
2.29.2
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] Cygwin: Launch cygmagic with bash, not sh
2020-12-07 6:17 [PATCH] Cygwin: Launch cygmagic with bash, not sh Mark Geisert
@ 2020-12-07 9:41 ` Corinna Vinschen
2020-12-08 14:50 ` Jon Turney
1 sibling, 0 replies; 3+ messages in thread
From: Corinna Vinschen @ 2020-12-07 9:41 UTC (permalink / raw)
To: cygwin-patches
On Dec 6 22:17, Mark Geisert wrote:
> On some systems /bin/sh is not /bin/bash and cygmagic has bash-isms in
> it. So even though cygmagic has a /bin/bash shebang, it also needs to be
> launched with bash from within Makefile.in.
>
> ---
> winsup/cygwin/Makefile.in | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/winsup/cygwin/Makefile.in b/winsup/cygwin/Makefile.in
> index b15c746cf..a840f2b83 100644
> --- a/winsup/cygwin/Makefile.in
> +++ b/winsup/cygwin/Makefile.in
> @@ -683,10 +683,10 @@ globals.h: mkglobals_h globals.cc
> ${DLL_OFILES} ${LIBCOS}: globals.h $(srcdir)/$(TLSOFFSETS_H)
>
> shared_info_magic.h: cygmagic shared_info.h
> - /bin/sh $(word 1,$^) $@ "${COMPILE.cc} -E -x c++" $(word 2,$^) SHARED_MAGIC 'class shared_info' USER_MAGIC 'class user_info'
> + /bin/bash $(word 1,$^) $@ "${COMPILE.cc} -E -x c++" $(word 2,$^) SHARED_MAGIC 'class shared_info' USER_MAGIC 'class user_info'
>
> child_info_magic.h: cygmagic child_info.h
> - /bin/sh $(word 1,$^) $@ "${COMPILE.cc} -E -x c++" $(word 2,$^) CHILD_INFO_MAGIC 'class child_info'
> + /bin/bash $(word 1,$^) $@ "${COMPILE.cc} -E -x c++" $(word 2,$^) CHILD_INFO_MAGIC 'class child_info'
>
> dcrt0.o sigproc.o: child_info_magic.h
>
> --
> 2.29.2
Pushed
Thanks,
Corinna
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] Cygwin: Launch cygmagic with bash, not sh
2020-12-07 6:17 [PATCH] Cygwin: Launch cygmagic with bash, not sh Mark Geisert
2020-12-07 9:41 ` Corinna Vinschen
@ 2020-12-08 14:50 ` Jon Turney
1 sibling, 0 replies; 3+ messages in thread
From: Jon Turney @ 2020-12-08 14:50 UTC (permalink / raw)
To: Mark Geisert, Cygwin Patches
On 07/12/2020 06:17, Mark Geisert wrote:
> On some systems /bin/sh is not /bin/bash and cygmagic has bash-isms in
> it. So even though cygmagic has a /bin/bash shebang, it also needs to be
> launched with bash from within Makefile.in.
Thanks.
Since cygmagic is executable, I don't think we actually need to mention
the shell here at all, but this is fine.
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2020-12-08 14:50 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-12-07 6:17 [PATCH] Cygwin: Launch cygmagic with bash, not sh Mark Geisert
2020-12-07 9:41 ` Corinna Vinschen
2020-12-08 14:50 ` Jon Turney
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).