This is the mail archive of the gcc-patches@gcc.gnu.org mailing list for the GCC project.


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]
Other format: [Raw text]

Re: [Toplevel] Pass $CONFIG_SHELL down to gcc (take2)


On Tue, 18 Nov 2003 18:02:42 -0500, Nathanael Nerode wrote:

>Yes.  If you could please do the same thing to the other 
>configure-[+module+], configure-build-[+module+], and 
>configure-target-[+module+] targets it would be a nicer, more complete 
>bugfix, though.  :-)

Like this?

Kelley Cook

toplevel:
2003-11-18  Kelley Cook  <kcook@gcc.gnu.org>

	* Makefile.tpl (BASE_FLAGS_TO_PASS): Pass along CONFIG_SHELL.
	(configure-build-[+module+], configure-[+module+]): Likewise.
	(configure-target-[+module+], configure-gcc, 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-11-19 08:28:51.000000000 -0500
+++ gcc-snapshot/Makefile.tpl	2003-11-19 13:58:56.514270000 -0500
@@ -389,6 +389,7 @@ all: all.normal
 # Flags to pass down to all sub-makes.
 BASE_FLAGS_TO_PASS = [+ FOR flags_to_pass +]\
 	"[+flag+]=$([+flag+])" [+ ENDFOR flags_to_pass +]\
+	"CONFIG_SHELL=$(SHELL)" \
 	"MAKEINFO=$(MAKEINFO) $(MAKEINFOFLAGS)" 

 # For any flags above that may contain shell code that varies from one
@@ -777,6 +778,7 @@ configure-build-[+module+]:
 	AS="$(AS_FOR_BUILD)"; export AS; \
 	CC="$(CC_FOR_BUILD)"; export CC; \
 	CFLAGS="$(CFLAGS_FOR_BUILD)"; export CFLAGS; \
+	CONFIG_SHELL="$(SHELL)"; export CONFIG_SHELL; \
 	CXX="$(CXX_FOR_BUILD)"; export CXX; \
 	CXXFLAGS="$(CXXFLAGS_FOR_BUILD)"; export CXXFLAGS; \
 	GCJ="$(GCJ_FOR_BUILD)"; export GCJ; \
@@ -848,6 +850,7 @@ configure-[+module+]:
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	CC="$(CC)"; export CC; \
 	CFLAGS="$(CFLAGS)"; export CFLAGS; \
+	CONFIG_SHELL="$(SHELL)"; export CONFIG_SHELL; \
 	CXX="$(CXX)"; export CXX; \
 	CXXFLAGS="$(CXXFLAGS)"; export CXXFLAGS; \
 	AR="$(AR)"; export AR; \
@@ -954,6 +957,7 @@ configure-target-[+module+]: $(TARGET_SU
 	AS="$(AS_FOR_TARGET)"; export AS; \
 	CC="$(CC_FOR_TARGET)"; export CC; \
 	CFLAGS="$(CFLAGS_FOR_TARGET)"; export CFLAGS; \
+	CONFIG_SHELL="$(SHELL)"; export CONFIG_SHELL; \
 	CPPFLAGS="$(CFLAGS_FOR_TARGET)"; export CPPFLAGS; \[+ 
 IF raw_cxx +]
 	CXX_FOR_TARGET="$(RAW_CXX_FOR_TARGET)"; export CXX_FOR_TARGET; \
@@ -1074,6 +1078,7 @@ configure-gcc:
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	CC="$(CC)"; export CC; \
 	CFLAGS="$(CFLAGS)"; export CFLAGS; \
+	CONFIG_SHELL="$(SHELL)"; export CONFIG_SHELL; \
 	CXX="$(CXX)"; export CXX; \
 	CXXFLAGS="$(CXXFLAGS)"; export CXXFLAGS; \
 	TOPLEVEL_CONFIGURE_ARGUMENTS="$(TOPLEVEL_CONFIGURE_ARGUMENTS)"; export TOPLEVEL_CONFIGURE_ARGUMENTS; \
@@ -1407,7 +1412,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




Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]