diff options
| author | Richard Biener <rguenther@suse.de> | 2022-03-10 13:35:46 +0100 |
|---|---|---|
| committer | Richard Biener <rguenther@suse.de> | 2022-03-10 13:40:25 +0100 |
| commit | 9467e7331188705ec16c086b77e1809c5b0aab7d (patch) | |
| tree | c5e5c3ffde5bb496b1f999e904f5f930b395e5e6 | |
| parent | 83bc478d3ba6a40fe3cec72dc9057ceca4dc9137 (diff) | |
| download | gcc-9467e7331188705ec16c086b77e1809c5b0aab7d.zip gcc-9467e7331188705ec16c086b77e1809c5b0aab7d.tar.gz gcc-9467e7331188705ec16c086b77e1809c5b0aab7d.tar.bz2 | |
ada/104861 - use target_noncanonial for Target_Name
The following arranges for s-oscons.ads to record target_noncanonical
for Target_Name, matching the install directory layout and what
gcc -dumpmachine says. This fixes build issues with gprbuild.
2022-03-10 Richard Biener <rguenther@suse.de>
PR ada/104861
gcc/ada/
* gcc-interface/Makefile.in (target_noncanonical): Substitute.
(OSCONS_CPP): Pass target_noncanonical as TARGET.
| -rw-r--r-- | gcc/ada/gcc-interface/Makefile.in | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/gcc/ada/gcc-interface/Makefile.in b/gcc/ada/gcc-interface/Makefile.in index b8a2470..1e9801a 100644 --- a/gcc/ada/gcc-interface/Makefile.in +++ b/gcc/ada/gcc-interface/Makefile.in @@ -138,6 +138,7 @@ objdir = . target_alias=@target_alias@ target=@target@ +target_noncanonical=@target_noncanonical@ target_cpu=@target_cpu@ target_vendor=@target_vendor@ target_os=@target_os@ @@ -598,7 +599,7 @@ OSCONS_CC=$(subst ./xgcc,../../xgcc,$(subst -B./, -B../../,$(GCC_FOR_TARGET))) # has a <types.h> header). OSCONS_CPP=$(OSCONS_CC) $(GNATLIBCFLAGS_FOR_C) -E -C \ - -DTARGET=\"$(target)\" -iquote $(fsrcpfx)ada $(fsrcpfx)ada/s-oscons-tmplt.c > s-oscons-tmplt.i + -DTARGET=\"$(target_noncanonical)\" -iquote $(fsrcpfx)ada $(fsrcpfx)ada/s-oscons-tmplt.c > s-oscons-tmplt.i OSCONS_EXTRACT=$(OSCONS_CC) $(GNATLIBCFLAGS_FOR_C) -S s-oscons-tmplt.i # Note: if you need to build with a non-GNU compiler, you could adapt the |