diff options
| author | Arnaud Charlet <charlet@adacore.com> | 2012-11-06 13:16:43 +0000 |
|---|---|---|
| committer | Arnaud Charlet <charlet@gcc.gnu.org> | 2012-11-06 14:16:43 +0100 |
| commit | c8fef899e88a4978b1391d2cae4cd240c644afbe (patch) | |
| tree | d10cbfac199e9b5438237deefc8f828db3a78a84 /libada | |
| parent | bd9d53f381d71a2037fe1986239a63272d7f6360 (diff) | |
Makefile.in (osconstool): Revert previous change, still needed after all.
* Makefile.in (osconstool): Revert previous change, still needed
after all. Add call to copy-s-oscons target.
From-SVN: r193240
Diffstat (limited to 'libada')
| -rw-r--r-- | libada/ChangeLog | 5 | ||||
| -rw-r--r-- | libada/Makefile.in | 8 |
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 |