[Ada] Use runtime from base compiler during stage1 (continued)
authorArnaud Charlet <charlet@adacore.com>
Wed, 16 Jun 2021 07:55:17 +0000 (03:55 -0400)
committerArnaud Charlet <charlet@adacore.com>
Thu, 17 Jun 2021 05:45:05 +0000 (01:45 -0400)
gcc/ada/

* gcc-interface/Make-lang.in: Use libgnat.so if libgnat.a cannot
be found.

gcc/ada/gcc-interface/Make-lang.in

index 896e760..b68081e 100644 (file)
@@ -87,7 +87,8 @@ endif
 
 ifeq ($(STAGE1),True)
   ADA_INCLUDES=$(COMMON_ADA_INCLUDES)
-  GNATLIB=$(dir $(shell $(CC) -print-libgcc-file-name))adalib/libgnat.a $(STAGE1_LIBS)
+  adalib=$(dir $(shell $(CC) -print-libgcc-file-name))adalib
+  GNATLIB=$(adalib)/$(if $(wildcard $(adalib)/libgnat.a),libgnat.a,libgnat.so) $(STAGE1_LIBS)
 else
   ADA_INCLUDES=-nostdinc $(COMMON_ADA_INCLUDES) -Iada/libgnat -I$(srcdir)/ada/libgnat -Iada/gcc-interface -I$(srcdir)/ada/gcc-interface
 endif