diff options
| author | Arnaud Charlet <charlet@adacore.com> | 2021-06-16 03:55:17 -0400 |
|---|---|---|
| committer | Arnaud Charlet <charlet@adacore.com> | 2021-06-17 01:45:05 -0400 |
| commit | 607507410efd6974e97ff39d633a4e742d07194a (patch) | |
| tree | 9a4ceefe71b2771a2095ace3831f75b840f8ba48 | |
| parent | ff4deb4b1d0c5947669ddc76fde4db83e28009d8 (diff) | |
| download | gcc-607507410efd6974e97ff39d633a4e742d07194a.zip gcc-607507410efd6974e97ff39d633a4e742d07194a.tar.gz gcc-607507410efd6974e97ff39d633a4e742d07194a.tar.bz2 | |
[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.
| -rw-r--r-- | gcc/ada/gcc-interface/Make-lang.in | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/gcc/ada/gcc-interface/Make-lang.in b/gcc/ada/gcc-interface/Make-lang.in index 896e760..b68081e 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 |