public inbox for gcc-cvs@sourceware.org
help / color / mirror / Atom feed
* [gcc r12-1549] [Ada] Use runtime from base compiler during stage1 (continued)
@ 2021-06-17 5:45 Arnaud Charlet
0 siblings, 0 replies; only message in thread
From: Arnaud Charlet @ 2021-06-17 5:45 UTC (permalink / raw)
To: gcc-cvs
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
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2021-06-17 5:45 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-06-17 5:45 [gcc r12-1549] [Ada] Use runtime from base compiler during stage1 (continued) Arnaud Charlet
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).