Fix bootstrap2 breakage due to re-use of obj-c checksum
authorBernd Edlinger <bernd.edlinger@hotmail.de>
Tue, 8 Jun 2021 20:14:52 +0000 (22:14 +0200)
committerBernd Edlinger <bernd.edlinger@hotmail.de>
Tue, 8 Jun 2021 21:07:10 +0000 (23:07 +0200)
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.

gcc/objc/Make-lang.in
gcc/objcp/Make-lang.in

index 9011140..8215283 100644 (file)
@@ -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) \
index 3ecc50b..0f890d8 100644 (file)
@@ -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) \