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: [PR40159,trunk,vta,vta4.4] don't succeed on failures in recursive make


On May 18, 2009, Alexandre Oliva <aoliva@redhat.com> wrote:

> Andreas Schwab reminds me I'm no longer suited to be a configury
> maintainer :-)

And H-P reinforces the point ;-) reminding me gcc-bootstrap and
gcc-no-bootstrap aren't mutually exclusive.  :-/

The patch broke src builds, and I hadn't tested that combination because
I didn't realize there was a third case to be tested :-(

Here's a fix tested on all 3 cases.  I'm installing it all over.

for  ChangeLog
from  Alexandre Oliva  <aoliva@redhat.com>

	PR other/40159
	* Makefile.tpl (all): Don't assume gcc-bootstrap and
	gcc-no-bootstrap are mutually exclusive.
	* Makefile.in: Rebuilt.

Index: Makefile.in
===================================================================
--- Makefile.in.orig	2009-05-18 21:00:55.000000000 -0300
+++ Makefile.in	2009-05-18 22:07:53.000000000 -0300
@@ -854,16 +854,16 @@ all:
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 @if gcc-bootstrap
-	if [ -f stage_last ]; then : ; \
+	if [ -f stage_last ]; then \
 	  TFLAGS="$(STAGE$(shell sed s,^stage,, stage_last)_TFLAGS)"; \
 	  $(MAKE) $(TARGET_FLAGS_TO_PASS) all-host all-target; \
 	else \
 @endif gcc-bootstrap
-@if gcc-no-bootstrap
-	if :; then :; \
-@endif gcc-no-bootstrap
-	  $(MAKE) $(RECURSE_FLAGS_TO_PASS) all-host all-target; \
+	  $(MAKE) $(RECURSE_FLAGS_TO_PASS) all-host all-target \
+@if gcc-bootstrap
+	    ; \
 	fi
+@endif gcc-bootstrap
 
 .PHONY: all-build
 
Index: Makefile.tpl
===================================================================
--- Makefile.tpl.orig	2009-05-18 22:07:47.000000000 -0300
+++ Makefile.tpl	2009-05-18 22:06:24.000000000 -0300
@@ -625,11 +625,11 @@ all:
 	  $(MAKE) $(TARGET_FLAGS_TO_PASS) all-host all-target; \
 	else \
 @endif gcc-bootstrap
-@if gcc-no-bootstrap
-	if :; then :; \
-@endif gcc-no-bootstrap
-	  $(MAKE) $(RECURSE_FLAGS_TO_PASS) all-host all-target; \
+	  $(MAKE) $(RECURSE_FLAGS_TO_PASS) all-host all-target \
+@if gcc-bootstrap
+	    ; \
 	fi
+@endif gcc-bootstrap
 
 .PHONY: all-build
 [+ FOR build_modules +]

-- 
Alexandre Oliva, freedom fighter    http://FSFLA.org/~lxoliva/
You must be the change you wish to see in the world. -- Gandhi
Be Free! -- http://FSFLA.org/   FSF Latin America board member
Free Software Evangelist      Red Hat Brazil Compiler Engineer

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