diff options
| author | sam <sam@138bc75d-0d04-0410-961f-82ee72b054a4> | 2008-08-30 08:51:53 +0000 |
|---|---|---|
| committer | sam <sam@138bc75d-0d04-0410-961f-82ee72b054a4> | 2008-08-30 08:51:53 +0000 |
| commit | f93009a49b6af8fbb0890d7d6e81765083595c2a (patch) | |
| tree | 9ba600fd862a997ccc0fd95ba1fe3d78231033c2 /gcc/ada | |
| parent | 46f4817eeebea5a884a22996e63078ea6f5f1a6b (diff) | |
| download | gcc-f93009a49b6af8fbb0890d7d6e81765083595c2a.tar.gz | |
2008-08-30 Thomas Quinot <quinot@adacore.com>
gcc/ada/
* gcc-interface/Make-lang.in: Allow s-oscons.{o,ali} to
be built even without a separate libada directory.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@139799 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'gcc/ada')
| -rw-r--r-- | gcc/ada/ChangeLog | 5 | ||||
| -rw-r--r-- | 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 4a9232ea9b2..745c8431e5d 100644 --- a/gcc/ada/ChangeLog +++ b/gcc/ada/ChangeLog @@ -1,3 +1,8 @@ +2008-08-30 Thomas Quinot <quinot@adacore.com> + + * gcc-interface/Make-lang.in: Allow s-oscons.{o,ali} to + be built even without a separate libada directory. + 2008-08-22 Arnaud Charlet <charlet@adacore.com> * 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 40017100128..c0b417f68f9 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 |