summaryrefslogtreecommitdiff
path: root/libada
diff options
context:
space:
mode:
authorcharlet <charlet@138bc75d-0d04-0410-961f-82ee72b054a4>2012-11-06 13:16:43 +0000
committercharlet <charlet@138bc75d-0d04-0410-961f-82ee72b054a4>2012-11-06 13:16:43 +0000
commit98982d6d85a065124465ffbaecb5a26b064c2ee4 (patch)
treed10cbfac199e9b5438237deefc8f828db3a78a84 /libada
parentac6c6457c8ad2fa30cd6148858ff053c9aa11824 (diff)
downloadgcc-98982d6d85a065124465ffbaecb5a26b064c2ee4.tar.gz
* Makefile.in (osconstool): Revert previous change, still needed
after all. Add call to copy-s-oscons target. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@193240 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libada')
-rw-r--r--libada/ChangeLog5
-rw-r--r--libada/Makefile.in8
2 files changed, 11 insertions, 2 deletions
diff --git a/libada/ChangeLog b/libada/ChangeLog
index 6c4a5c85ed5..6172aad82cc 100644
--- a/libada/ChangeLog
+++ b/libada/ChangeLog
@@ -1,5 +1,10 @@
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>
diff --git a/libada/Makefile.in b/libada/Makefile.in
index 2b778e0c98e..863b136fc85 100644
--- a/libada/Makefile.in
+++ b/libada/Makefile.in
@@ -94,7 +94,7 @@ LIBADA_FLAGS_TO_PASS = \
.PHONY: gnatlib gnatlib-plain gnatlib-sjlj gnatlib-zcx gnatlib-shared osconstool
gnatlib: @default_gnatlib_target@
-gnatlib-plain: $(GCC_DIR)/ada/Makefile
+gnatlib-plain: osconstool $(GCC_DIR)/ada/Makefile
test -f stamp-libada || \
$(MAKE) -C $(GCC_DIR)/ada $(LIBADA_FLAGS_TO_PASS) gnatlib \
&& touch stamp-libada
@@ -103,7 +103,7 @@ gnatlib-plain: $(GCC_DIR)/ada/Makefile
$(LN_S) $(ADA_RTS_DIR) adainclude
$(LN_S) $(ADA_RTS_DIR) adalib
-gnatlib-sjlj gnatlib-zcx gnatlib-shared: $(GCC_DIR)/ada/Makefile
+gnatlib-sjlj gnatlib-zcx gnatlib-shared: osconstool $(GCC_DIR)/ada/Makefile
test -f stamp-libada || \
$(MAKE) -C $(GCC_DIR)/ada $(LIBADA_FLAGS_TO_PASS) $@ \
&& touch stamp-libada
@@ -112,6 +112,10 @@ gnatlib-sjlj gnatlib-zcx gnatlib-shared: $(GCC_DIR)/ada/Makefile
$(LN_S) $(ADA_RTS_DIR) adainclude
$(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
+
install-gnatlib: $(GCC_DIR)/ada/Makefile
$(MAKE) -C $(GCC_DIR)/ada $(LIBADA_FLAGS_TO_PASS) install-gnatlib