public inbox for gcc-cvs@sourceware.org
help / color / mirror / Atom feed
* [gcc r12-1307] Fix bootstrap2 breakage due to re-use of obj-c checksum
@ 2021-06-08 21:07 Bernd Edlinger
  0 siblings, 0 replies; only message in thread
From: Bernd Edlinger @ 2021-06-08 21:07 UTC (permalink / raw)
  To: gcc-cvs

https://gcc.gnu.org/g:40917137b6bb66c8020add0b4083c13b566275ba

commit r12-1307-g40917137b6bb66c8020add0b4083c13b566275ba
Author: Bernd Edlinger <bernd.edlinger@hotmail.de>
Date:   Tue Jun 8 22:14:52 2021 +0200

    Fix bootstrap2 breakage due to re-use of obj-c checksum
    
    gcc/objc:
    2021-06-08  Bernd Edlinger  <bernd.edlinger@hotmail.de>
    
            * Make-lang.in (cc1-obj-checksum.c): Check previous
            stage checksum exists.
    
    gcc/objcp:
    2021-06-08  Bernd Edlinger  <bernd.edlinger@hotmail.de>
    
            * Make-lang.in (cc1objplus-checksum.c): Check previous
            stage checksum exists.

Diff:
---
 gcc/objc/Make-lang.in  | 3 ++-
 gcc/objcp/Make-lang.in | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/gcc/objc/Make-lang.in b/gcc/objc/Make-lang.in
index 901114066d5..82152831a40 100644
--- a/gcc/objc/Make-lang.in
+++ b/gcc/objc/Make-lang.in
@@ -63,7 +63,8 @@ objc_OBJS = $(OBJC_OBJS) cc1obj-checksum.o
 cc1obj-checksum.c : build/genchecksum$(build_exeext) checksum-options \
         $(OBJC_OBJS) $(C_AND_OBJC_OBJS) $(BACKEND) $(LIBDEPS)
 	if [ -f ../stage_final ] \
-	   && cmp -s ../stage_current ../stage_final; then \
+	   && cmp -s ../stage_current ../stage_final \
+	   && [ -f ../prev-gcc/$@ ]; then \
 	  cp ../prev-gcc/$@ $@; \
 	else \
 	  build/genchecksum$(build_exeext) $(OBJC_OBJS) $(C_AND_OBJC_OBJS) \
diff --git a/gcc/objcp/Make-lang.in b/gcc/objcp/Make-lang.in
index 3ecc50b53bd..0f890d88f3f 100644
--- a/gcc/objcp/Make-lang.in
+++ b/gcc/objcp/Make-lang.in
@@ -66,7 +66,8 @@ obj-c++_OBJS = $(OBJCXX_OBJS) cc1objplus-checksum.o
 cc1objplus-checksum.c : build/genchecksum$(build_exeext) checksum-options \
 	$(OBJCXX_OBJS) $(BACKEND) $(CODYLIB) $(LIBDEPS)
 	if [ -f ../stage_final ] \
-	   && cmp -s ../stage_current ../stage_final; then \
+	   && cmp -s ../stage_current ../stage_final \
+	   && [ -f ../prev-gcc/$@ ]; then \
 	  cp ../prev-gcc/$@ $@; \
 	else \
 	  build/genchecksum$(build_exeext) $(OBJCXX_OBJS) $(BACKEND) \


^ permalink raw reply	[flat|nested] only message in thread

only message in thread, other threads:[~2021-06-08 21:07 UTC | newest]

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-06-08 21:07 [gcc r12-1307] Fix bootstrap2 breakage due to re-use of obj-c checksum Bernd Edlinger

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).