From 5b0c96e3cdf486b15cc6d216ac1a528a4f58842c Mon Sep 17 00:00:00 2001 From: marxin Date: Wed, 28 Jun 2017 07:54:14 +0000 Subject: [PATCH] Fix PR bootstrap/81217 2017-06-28 Martin Liska PR bootstrap/81217 * Makefile.def: Remove superfluous bootstrap_target from bootstrap_stage. * Makefile.in: Re-generate the file. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@249726 138bc75d-0d04-0410-961f-82ee72b054a4 --- ChangeLog | 7 +++++++ Makefile.def | 3 +-- Makefile.in | 23 ----------------------- 3 files changed, 8 insertions(+), 25 deletions(-) diff --git a/ChangeLog b/ChangeLog index 47cfa8f69bc..4d7f8842d24 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2017-06-28 Martin Liska + + PR bootstrap/81217 + * Makefile.def: Remove superfluous bootstrap_target from + bootstrap_stage. + * Makefile.in: Re-generate the file. + 2017-06-26 Maxim Ostapenko * MAINTAINERS: Add myself to Write After Approval diff --git a/Makefile.def b/Makefile.def index 08d0dc08a46..bd7b080d905 100644 --- a/Makefile.def +++ b/Makefile.def @@ -623,8 +623,7 @@ bootstrap_stage = { bootstrap_stage = { id=profile ; prev=1 ; }; bootstrap_stage = { - id=train; prev=profile ; - bootstrap_target=profiledbootstrap ; }; + id=train; prev=profile ; } ; bootstrap_stage = { id=feedback ; prev=train; bootstrap_target=profiledbootstrap ; }; diff --git a/Makefile.in b/Makefile.in index 2e2e504e106..78db0982ba2 100644 --- a/Makefile.in +++ b/Makefile.in @@ -56151,29 +56151,6 @@ do-clean: clean-stagetrain -.PHONY: profiledbootstrap profiledbootstrap-lean -profiledbootstrap: - echo stagetrain > stage_final - @r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(MAKE) $(RECURSE_FLAGS_TO_PASS) stagetrain-bubble - @: $(MAKE); $(unstage) - @r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - TFLAGS="$(STAGEtrain_TFLAGS)"; \ - $(MAKE) $(TARGET_FLAGS_TO_PASS) all-host all-target - -profiledbootstrap-lean: - echo stagetrain > stage_final - @r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(MAKE) $(RECURSE_FLAGS_TO_PASS) LEAN=: stagetrain-bubble - @: $(MAKE); $(unstage) - @r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - TFLAGS="$(STAGEtrain_TFLAGS)"; \ - $(MAKE) $(TARGET_FLAGS_TO_PASS) all-host all-target - # Rules to wipe a stage and all the following ones, also used for cleanstrap distclean-stageprofile:: distclean-stagetrain -- 2.11.4.GIT