From 52dae6f4347ea1a859f50b4a6142012ddb33e9ea Mon Sep 17 00:00:00 2001 From: ebotcazou Date: Wed, 7 Nov 2012 04:58:23 +0000 Subject: * 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 --- libada/ChangeLog | 13 ------------- libada/Makefile.in | 3 +-- 2 files changed, 1 insertion(+), 15 deletions(-) (limited to 'libada') diff --git a/libada/ChangeLog b/libada/ChangeLog index 6172aad82cc2..1778a14e4a29 100644 --- a/libada/ChangeLog +++ b/libada/ChangeLog @@ -1,16 +1,3 @@ -2012-10-30 Arnaud Charlet - - * Makefile.in (osconstool): Revert previous change, still needed - after all. Add call to copy-s-oscons target. - -2012-10-30 Arnaud Charlet - - * Makefile.in (osconstool): Removed, no longer needed. - -2012-10-30 Arnaud Charlet - - * Makefile.in (osconstool): Fix target. - 2012-06-11 Olivier Hainque * Makefile.in (GNATLIBCFLAGS_FOR_C): Remove $(PICFLAG). diff --git a/libada/Makefile.in b/libada/Makefile.in index 863b136fc851..389a2fb2f799 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 -- cgit v1.2.3