From: Jeffrey A Law <law@cygnus.com>
Date: Thu, 11 Sep 1997 03:36:41 +0000 (+0000)
Subject: Makefile (compare): Exit with nonzero status if there are comparison failures.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=3fb2f4012723a0162164ae416e6b89a61964c1b8;p=gcc.git

Makefile (compare): Exit with nonzero status if there are comparison failures.

        * Makefile (compare): Exit with nonzero status if there
        are comparison failures.  Note which files failed the
        comparison test in .bad_compare.
For toplevel "make bootstrap".

From-SVN: r15400
---

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 410dcfceeaf..b73336b6a82 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+Wed Sep 10 21:37:30 1997  Jeffrey A Law  (law@cygnus.com)
+
+	* Makefile.in (compare): Exit with nonzero status if there
+	are comparison failures.  Note which files failed the
+	comparison test in .bad_compare.
+
 Wed Sep 10 17:05:46 1997  H.J. Lu  (hjl@gnu.ai.mit.edu)
 
 	* config/alpha/elf.h (CPP_PREDEFINES): Remove -D__PIC__ -D__pic__.
diff --git a/gcc/Makefile.in b/gcc/Makefile.in
index c1e4e2315b2..481295b0ff1 100644
--- a/gcc/Makefile.in
+++ b/gcc/Makefile.in
@@ -2589,21 +2589,30 @@ bootstrap3: force
 
 # ./ avoids bug in some versions of tail.
 compare: force
+	-rm -f .bad_compare
 	for file in *$(objext); do \
 	  tail +16c ./$$file > tmp-foo1; \
-	  tail +16c stage2/$$file > tmp-foo2 2>/dev/null \
-	    && (cmp tmp-foo1 tmp-foo2 || echo $$file differs) || true; \
+	  tail +16c stage2/$$file > tmp-foo2 \
+	    && (cmp tmp-foo1 tmp-foo2 > /dev/null 2>&1 || echo $$file differs >> .bad_compare) || true; \
 	done
 	for dir in tmp-foo $(SUBDIRS); do \
 	  if [ "`echo $$dir/*$(objext)`" != "$$dir/*$(objext)" ] ; then \
 	    for file in $$dir/*$(objext); do \
 	      tail +16c ./$$file > tmp-foo1; \
-	      tail +16c stage2/$$file > tmp-foo2 2>/dev/null \
-	        && (cmp tmp-foo1 tmp-foo2 || echo $$file differs) || true; \
+	      tail +16c stage2/$$file > tmp-foo2 \
+	        && (cmp tmp-foo1 tmp-foo2 > /dev/null 2>&1 || echo $$file differs >> .bad_compare) || true; \
 	    done; \
 	  fi; \
 	done
 	-rm -f tmp-foo*
+	if [ -f .bad_compare ]; then \
+	  echo "Bootstrap comparison failure!"; \
+	  cat .bad_compare; \
+	  exit 1; \
+	else true; \
+	fi
+	
+	
 
 # Similar, but compare with stage3 directory
 compare3: force