aboutsummaryrefslogtreecommitdiff
path: root/Makefile.tpl
diff options
context:
space:
mode:
authorNathanael Nerode <neroden@gcc.gnu.org>2004-04-09 05:17:48 +0000
committerNathanael Nerode <neroden@gcc.gnu.org>2004-04-09 05:17:48 +0000
commit54752a6b0d7a1a159d80aec5f5b8f7a59eca56e3 (patch)
treebc367c490e539b173f3ba936c67ffab9a57b221d /Makefile.tpl
parent077dba53cf2423aee666569f1747375b11915d04 (diff)
downloadgdb-54752a6b0d7a1a159d80aec5f5b8f7a59eca56e3.zip
gdb-54752a6b0d7a1a159d80aec5f5b8f7a59eca56e3.tar.gz
gdb-54752a6b0d7a1a159d80aec5f5b8f7a59eca56e3.tar.bz2
2004-04-09 Nathanael Nerode <neroden@gcc.gnu.org>
PR bootstrap/14871 * Makefile.tpl: If we don't have built-in-tree target tools, use the ones found by configure rather than hacking around with program_transform_name. * configure.in: Give Makefile.tpl the information necessary to do that. * Makefile.in: Regenerate. * configure: Regenerate. 2004-04-06 Nathanael Nerode <neroden@gcc.gnu.org> PR bootstrap/14760 * configure.in: When computing baseargs, strip *all* copies of offending options. Also, don't match/substitute the trailing space, so that this actually works when two similar options are separated by only one space. * configure: Regenerate. 2004-04-06 David Edelsohn <edelsohn@gnu.org> * configure.in (powerpc-*-aix*): Remove target-libada from noconfigdirs. (rs6000-*-aix*): Same. * configure: Regenerate.
Diffstat (limited to 'Makefile.tpl')
-rw-r--r--Makefile.tpl21
1 files changed, 14 insertions, 7 deletions
diff --git a/Makefile.tpl b/Makefile.tpl
index cd7e06e..e52f709 100644
--- a/Makefile.tpl
+++ b/Makefile.tpl
@@ -249,6 +249,7 @@ TARGET_LIB_PATH = $$r/$(TARGET_SUBDIR)/libstdc++-v3/src/.libs:
FLAGS_FOR_TARGET = @FLAGS_FOR_TARGET@
AR_FOR_TARGET=@AR_FOR_TARGET@
+CONFIGURED_AR_FOR_TARGET=@CONFIGURED_AR_FOR_TARGET@
USUAL_AR_FOR_TARGET = ` \
if [ -f $$r/binutils/ar ] ; then \
echo $$r/binutils/ar ; \
@@ -256,11 +257,12 @@ USUAL_AR_FOR_TARGET = ` \
if [ '$(host)' = '$(target)' ] ; then \
echo $(AR); \
else \
- echo ar | sed '$(program_transform_name)' ; \
+ echo $(CONFIGURED_AR_FOR_TARGET) ; \
fi; \
fi`
AS_FOR_TARGET=@AS_FOR_TARGET@
+CONFIGURED_AS_FOR_TARGET=@CONFIGURED_AS_FOR_TARGET@
USUAL_AS_FOR_TARGET = ` \
if [ -f $$r/gas/as-new ] ; then \
echo $$r/gas/as-new ; \
@@ -270,7 +272,7 @@ USUAL_AS_FOR_TARGET = ` \
if [ '$(host)' = '$(target)' ] ; then \
echo $(AS); \
else \
- echo as | sed '$(program_transform_name)' ; \
+ echo $(CONFIGURED_AS_FOR_TARGET) ; \
fi; \
fi`
@@ -296,6 +298,7 @@ CXXFLAGS_FOR_TARGET = $(CXXFLAGS)
LIBCXXFLAGS_FOR_TARGET = $(CXXFLAGS_FOR_TARGET) -fno-implicit-templates
DLLTOOL_FOR_TARGET=@DLLTOOL_FOR_TARGET@
+CONFIGURED_DLLTOOL_FOR_TARGET=@CONFIGURED_DLLTOOL_FOR_TARGET@
USUAL_DLLTOOL_FOR_TARGET = ` \
if [ -f $$r/binutils/dlltool ] ; then \
echo $$r/binutils/dlltool ; \
@@ -303,13 +306,14 @@ USUAL_DLLTOOL_FOR_TARGET = ` \
if [ '$(host)' = '$(target)' ] ; then \
echo $(DLLTOOL); \
else \
- echo dlltool | sed '$(program_transform_name)' ; \
+ echo $(CONFIGURED_DLLTOOL_FOR_TARGET) ; \
fi; \
fi`
GCJ_FOR_TARGET = @GCJ_FOR_TARGET@
LD_FOR_TARGET=@LD_FOR_TARGET@
+CONFIGURED_LD_FOR_TARGET=@CONFIGURED_LD_FOR_TARGET@
USUAL_LD_FOR_TARGET = ` \
if [ -f $$r/ld/ld-new ] ; then \
echo $$r/ld/ld-new ; \
@@ -319,13 +323,14 @@ USUAL_LD_FOR_TARGET = ` \
if [ '$(host)' = '$(target)' ] ; then \
echo $(LD); \
else \
- echo ld | sed '$(program_transform_name)' ; \
+ echo $(CONFIGURED_LD_FOR_TARGET) ; \
fi; \
fi`
LDFLAGS_FOR_TARGET =
NM_FOR_TARGET=@NM_FOR_TARGET@
+CONFIGURED_NM_FOR_TARGET=@CONFIGURED_NM_FOR_TARGET@
USUAL_NM_FOR_TARGET = ` \
if [ -f $$r/binutils/nm-new ] ; then \
echo $$r/binutils/nm-new ; \
@@ -335,11 +340,12 @@ USUAL_NM_FOR_TARGET = ` \
if [ '$(host)' = '$(target)' ] ; then \
echo $(NM); \
else \
- echo nm | sed '$(program_transform_name)' ; \
+ echo $(CONFIGURED_NM_FOR_TARGET) ; \
fi; \
fi`
RANLIB_FOR_TARGET=@RANLIB_FOR_TARGET@
+CONFIGURED_RANLIB_FOR_TARGET=@CONFIGURED_RANLIB_FOR_TARGET@
USUAL_RANLIB_FOR_TARGET = ` \
if [ -f $$r/binutils/ranlib ] ; then \
echo $$r/binutils/ranlib ; \
@@ -351,11 +357,12 @@ USUAL_RANLIB_FOR_TARGET = ` \
echo ranlib; \
fi; \
else \
- echo ranlib | sed '$(program_transform_name)' ; \
+ echo $(CONFIGURED_RANLIB_FOR_TARGET) ; \
fi; \
fi`
WINDRES_FOR_TARGET=@WINDRES_FOR_TARGET@
+CONFIGURED_WINDRES_FOR_TARGET=@CONFIGURED_WINDRES_FOR_TARGET@
USUAL_WINDRES_FOR_TARGET = ` \
if [ -f $$r/binutils/windres ] ; then \
echo $$r/binutils/windres ; \
@@ -363,7 +370,7 @@ USUAL_WINDRES_FOR_TARGET = ` \
if [ '$(host)' = '$(target)' ] ; then \
echo $(WINDRES); \
else \
- echo windres | sed '$(program_transform_name)' ; \
+ echo $(CONFIGURED_WINDRES_FOR_TARGET) ; \
fi; \
fi`