summaryrefslogtreecommitdiff
path: root/libada
diff options
context:
space:
mode:
authorebotcazou <ebotcazou@138bc75d-0d04-0410-961f-82ee72b054a4>2012-11-07 04:58:23 +0000
committerebotcazou <ebotcazou@138bc75d-0d04-0410-961f-82ee72b054a4>2012-11-07 04:58:23 +0000
commit52dae6f4347ea1a859f50b4a6142012ddb33e9ea (patch)
treecb1850e5b6b3a5d98350be8bfc908ec551323cc4 /libada
parentb54a6018bb0750a374ec85b0b8e01120fefc61e5 (diff)
downloadgcc-52dae6f4347ea1a859f50b4a6142012ddb33e9ea.tar.gz
* gcc-interface/Makefile.in: Revert most changes.
* gcc-interface/Make-lang.in (gnatlib): Remove ada/s-oscons.ads. libada/ * libada/Makefile.in: Revert most changes. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@193280 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libada')
-rw-r--r--libada/ChangeLog13
-rw-r--r--libada/Makefile.in3
2 files changed, 1 insertions, 15 deletions
diff --git a/libada/ChangeLog b/libada/ChangeLog
index 6172aad82cc..1778a14e4a2 100644
--- a/libada/ChangeLog
+++ b/libada/ChangeLog
@@ -1,16 +1,3 @@
-2012-10-30 Arnaud Charlet <charlet@adacore.com>
-
- * Makefile.in (osconstool): Revert previous change, still needed
- after all. Add call to copy-s-oscons target.
-
-2012-10-30 Arnaud Charlet <charlet@adacore.com>
-
- * Makefile.in (osconstool): Removed, no longer needed.
-
-2012-10-30 Arnaud Charlet <charlet@adacore.com>
-
- * Makefile.in (osconstool): Fix target.
-
2012-06-11 Olivier Hainque <hainque@adacore.com>
* Makefile.in (GNATLIBCFLAGS_FOR_C): Remove $(PICFLAG).
diff --git a/libada/Makefile.in b/libada/Makefile.in
index 863b136fc85..389a2fb2f79 100644
--- a/libada/Makefile.in
+++ b/libada/Makefile.in
@@ -113,8 +113,7 @@ gnatlib-sjlj gnatlib-zcx gnatlib-shared: osconstool $(GCC_DIR)/ada/Makefile
$(LN_S) $(ADA_RTS_DIR) adalib
osconstool:
- $(MAKE) -C $(GCC_DIR) $(LIBADA_FLAGS_TO_PASS) ada/s-oscons.ads
- $(MAKE) -C $(GCC_DIR)/ada $(LIBADA_FLAGS_TO_PASS) copy-s-oscons
+ $(MAKE) -C $(GCC_DIR)/ada $(LIBADA_FLAGS_TO_PASS) ./bldtools/oscons/xoscons
install-gnatlib: $(GCC_DIR)/ada/Makefile
$(MAKE) -C $(GCC_DIR)/ada $(LIBADA_FLAGS_TO_PASS) install-gnatlib