This is the mail archive of the
gcc-patches@gcc.gnu.org
mailing list for the GCC project.
Re: [Toplevel] Pass $CONFIG_SHELL down to gcc
- From: Kelley Cook <kcook34 at ford dot com>
- To: gcc-patches at gcc dot gnu dot org
- Cc: Nathanael Nerode <neroden at twcny dot rr dot com>
- Date: Tue, 18 Nov 2003 10:43:19 -0500
- Subject: Re: [Toplevel] Pass $CONFIG_SHELL down to gcc
- Hop-count: 1
- References: <3FB904B1.1060805@ford.com>
- Reply-to: Kelley Cook <kelleycook at wideopenwest dot com>
Kelley Cook wrote:
Not being a Makefile guru, there quite likely is a more correct way to
fix this, but this one-liner patch does correct the problem.
Due to the gcc_version_check tripping, today it became apparent that I
missed two spots where the Makefiles will automagically remake themselves.
I'm, of course, open to suggestions on a better way than this hack, but
it seems to do the job.
make restrap on i686-pc-cygwin (which will trip the Cygwin /bin/sh bug).
New version OK?
Kelley Cook
toplevel:
2003-11-18 Kelley Cook <kcook@gcc.gnu.org>
* Makefile.tpl (configure-gcc): Pass along CONFIG_SHELL.
(config.status): Likewise.
* Makefile.in: Regenerate.
gcc:
2003-11-18 Kelley Cook <kcook@gcc.gnu.org>
* Makefile.in (Makefile): Pass along CONFIG_SHELL.
diff -up gcc-orig/Makefile.tpl gcc-snapshot/Makefile.tpl
--- gcc-orig/Makefile.tpl 2003-10-13 17:43:32.000000000 -0400
+++ gcc-snapshot/Makefile.tpl 2003-11-18 10:17:55.518822900 -0500
@@ -1086,6 +1086,7 @@ configure-gcc:
WINDRES="$(WINDRES)"; export WINDRES; \
OBJCOPY="$(OBJCOPY)"; export OBJCOPY; \
OBJDUMP="$(OBJDUMP)"; export OBJDUMP; \
+ CONFIG_SHELL="$(SHELL)"; export CONFIG_SHELL; \
echo Configuring in gcc; \
cd gcc || exit 1; \
case $(srcdir) in \
@@ -1406,7 +1407,7 @@ Makefile: $(srcdir)/Makefile.in config.s
CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
config.status: configure $(gcc_version_trigger)
- $(SHELL) ./config.status --recheck
+ CONFIG_SHELL="$(SHELL)" $(SHELL) ./config.status --recheck
# Rebuilding configure.
AUTOCONF = autoconf
diff -up gcc-orig/gcc/Makefile.in gcc-snapshot/gcc/Makefile.in
--- gcc-orig/gcc/Makefile.in 2003-11-16 14:10:05.000000000 -0500
+++ gcc-snapshot/gcc/Makefile.in 2003-11-17 13:11:43.046352000 -0500
@@ -965,6 +961,7 @@ endif
Makefile: config.status $(srcdir)/Makefile.in $(srcdir)/version.c $(LANG_MAKEFRAGS)
LANGUAGES="$(CONFIG_LANGUAGES)" \
CONFIG_HEADERS= \
+ CONFIG_SHELL="$(SHELL)" \
CONFIG_FILES=$@ $(SHELL) config.status
config.h: cs-config.h ; @true