From 21bacb7e151c93c5944d8645bb780693fc55f586 Mon Sep 17 00:00:00 2001 From: Thomas Quinot Date: Sat, 30 Aug 2008 08:51:53 +0000 Subject: [PATCH] Make-lang.in: Allow s-oscons.{o,ali} to be built even without a separate libada directory. 2008-08-30 Thomas Quinot gcc/ada/ * gcc-interface/Make-lang.in: Allow s-oscons.{o,ali} to be built even without a separate libada directory. From-SVN: r139799 --- gcc/ada/ChangeLog | 5 +++++ gcc/ada/gcc-interface/Make-lang.in | 6 ++++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog index 4a9232ea9b24..745c8431e5d8 100644 --- a/gcc/ada/ChangeLog +++ b/gcc/ada/ChangeLog @@ -1,3 +1,8 @@ +2008-08-30 Thomas Quinot + + * gcc-interface/Make-lang.in: Allow s-oscons.{o,ali} to + be built even without a separate libada directory. + 2008-08-22 Arnaud Charlet * lib-xref.ads: Fix typo in subprogram reference definition. diff --git a/gcc/ada/gcc-interface/Make-lang.in b/gcc/ada/gcc-interface/Make-lang.in index 400171001283..c0b417f68f91 100644 --- a/gcc/ada/gcc-interface/Make-lang.in +++ b/gcc/ada/gcc-interface/Make-lang.in @@ -933,9 +933,11 @@ OSCONS_EXTRACT=../../../$(DECC) -DNATIVE \ ./s-oscons-tmplt.exe > s-oscons-tmplt.s else -OSCONS_CPP=$(GCC_FOR_TARGET) $(CFLAGS_FOR_TARGET) -E -C \ +OSCONS_CC=`echo "$(GCC_FOR_TARGET)" \ + | sed -e 's^\./xgcc^../../../xgcc^' -e 's^-B./^-B../../../^'` +OSCONS_CPP=$(OSCONS_CC) $(CFLAGS_FOR_TARGET) -E -C \ -DTARGET=\"$(target)\" s-oscons-tmplt.c > s-oscons-tmplt.i -OSCONS_EXTRACT=$(GCC_FOR_TARGET) $(CFLAGS_FOR_TARGET) -S s-oscons-tmplt.i +OSCONS_EXTRACT=$(OSCONS_CC) $(CFLAGS_FOR_TARGET) -S s-oscons-tmplt.i endif ada/s-oscons.ads : ada/s-oscons-tmplt.c ada/gsocket.h ada/xoscons.adb ada/xutil.ads ada/xutil.adb -- 2.47.3