From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <charlet@sourceware.org>
Received: by sourceware.org (Postfix, from userid 1328)
 id B9A78385381C; Thu, 17 Jun 2021 05:45:39 +0000 (GMT)
DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org B9A78385381C
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Content-Type: text/plain; charset="utf-8"
From: Arnaud Charlet <charlet@gcc.gnu.org>
To: gcc-cvs@gcc.gnu.org
Subject: [gcc r12-1549] [Ada] Use runtime from base compiler during stage1
 (continued)
X-Act-Checkin: gcc
X-Git-Author: Arnaud Charlet <charlet@adacore.com>
X-Git-Refname: refs/heads/master
X-Git-Oldrev: ff4deb4b1d0c5947669ddc76fde4db83e28009d8
X-Git-Newrev: 607507410efd6974e97ff39d633a4e742d07194a
Message-Id: <20210617054539.B9A78385381C@sourceware.org>
Date: Thu, 17 Jun 2021 05:45:39 +0000 (GMT)
X-BeenThere: gcc-cvs@gcc.gnu.org
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: Gcc-cvs mailing list <gcc-cvs.gcc.gnu.org>
List-Unsubscribe: <https://gcc.gnu.org/mailman/options/gcc-cvs>,
 <mailto:gcc-cvs-request@gcc.gnu.org?subject=unsubscribe>
List-Archive: <https://gcc.gnu.org/pipermail/gcc-cvs/>
List-Help: <mailto:gcc-cvs-request@gcc.gnu.org?subject=help>
List-Subscribe: <https://gcc.gnu.org/mailman/listinfo/gcc-cvs>,
 <mailto:gcc-cvs-request@gcc.gnu.org?subject=subscribe>
X-List-Received-Date: Thu, 17 Jun 2021 05:45:39 -0000

https://gcc.gnu.org/g:607507410efd6974e97ff39d633a4e742d07194a

commit r12-1549-g607507410efd6974e97ff39d633a4e742d07194a
Author: Arnaud Charlet <charlet@adacore.com>
Date:   Wed Jun 16 03:55:17 2021 -0400

    [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:
---
 gcc/ada/gcc-interface/Make-lang.in | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/gcc/ada/gcc-interface/Make-lang.in b/gcc/ada/gcc-interface/Make-lang.in
index 896e7603af7..b68081ed065 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