diff options
author | neroden <neroden@138bc75d-0d04-0410-961f-82ee72b054a4> | 2004-04-09 05:15:06 +0000 |
---|---|---|
committer | neroden <neroden@138bc75d-0d04-0410-961f-82ee72b054a4> | 2004-04-09 05:15:06 +0000 |
commit | 49aae208df317027c48b7d2ac0fd73c100ba198f (patch) | |
tree | bf45dc710b798fefba9f14579d7c3f200a9a903b /Makefile.in | |
parent | 9bd39433796abde75eedc5f29bedd557fefb8190 (diff) | |
download | gcc-49aae208df317027c48b7d2ac0fd73c100ba198f.tar.gz |
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.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@80542 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'Makefile.in')
-rw-r--r-- | Makefile.in | 21 |
1 files changed, 14 insertions, 7 deletions
diff --git a/Makefile.in b/Makefile.in index 593566086b5..bf7bc3e0685 100644 --- a/Makefile.in +++ b/Makefile.in @@ -246,6 +246,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 ; \ @@ -253,11 +254,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 ; \ @@ -267,7 +269,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` @@ -293,6 +295,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 ; \ @@ -300,13 +303,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 ; \ @@ -316,13 +320,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 ; \ @@ -332,11 +337,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 ; \ @@ -348,11 +354,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 ; \ @@ -360,7 +367,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` |