From: Arnaud Charlet <charlet@adacore.com>
Date: Wed, 16 Jun 2021 07:55:17 +0000 (-0400)
Subject: [Ada] Use runtime from base compiler during stage1 (continued)
X-Git-Tag: basepoints/gcc-13~6764
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=607507410efd6974e97ff39d633a4e742d07194a;p=thirdparty%2Fgcc.git

[Ada] Use runtime from base compiler during stage1 (continued)

gcc/ada/

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

diff --git a/gcc/ada/gcc-interface/Make-lang.in b/gcc/ada/gcc-interface/Make-lang.in
index 896e7603af73..b68081ed065e 100644
--- a/gcc/ada/gcc-interface/Make-lang.in
+++ b/gcc/ada/gcc-interface/Make-lang.in
@@ -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