aboutsummaryrefslogtreecommitdiff
path: root/Makefile.tpl
diff options
context:
space:
mode:
authorNathanael Nerode <neroden@gcc.gnu.org>2003-12-19 15:13:56 +0000
committerNathanael Nerode <neroden@gcc.gnu.org>2003-12-19 15:13:56 +0000
commit10ecffb9b24b79b6a9f373d0c9df0f4c447864a5 (patch)
treecd187212cab3636132cae59cd21e2fd3ac03627a /Makefile.tpl
parent7653c69b3fdd57b6cd34a4467334535e21a08f19 (diff)
downloadgdb-10ecffb9b24b79b6a9f373d0c9df0f4c447864a5.zip
gdb-10ecffb9b24b79b6a9f373d0c9df0f4c447864a5.tar.gz
gdb-10ecffb9b24b79b6a9f373d0c9df0f4c447864a5.tar.bz2
2003-12-19 Nathanael Nerode <neroden@gcc.gnu.org>
Port change over from GCC: 2003-11-20 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.
Diffstat (limited to 'Makefile.tpl')
-rw-r--r--Makefile.tpl7
1 files changed, 6 insertions, 1 deletions
diff --git a/Makefile.tpl b/Makefile.tpl
index f8f8005..3b545c4 100644
--- a/Makefile.tpl
+++ b/Makefile.tpl
@@ -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_SUBDIR)/[+module+]/multilib.out
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.status
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