public inbox for gcc-cvs@sourceware.org
help / color / mirror / Atom feed
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)
Date: Thu, 17 Jun 2021 05:45:39 +0000 (GMT)	[thread overview]
Message-ID: <20210617054539.B9A78385381C@sourceware.org> (raw)

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


                 reply	other threads:[~2021-06-17  5:45 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20210617054539.B9A78385381C@sourceware.org \
    --to=charlet@gcc.gnu.org \
    --cc=gcc-cvs@gcc.gnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
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).