git
/
gcc
mirror of git://gcc.gnu.org/git/gcc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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
This commit is contained in:
Arnaud Charlet 2012-11-06 13:16:43 +00:00 committed by Arnaud Charlet
parent bd9d53f381
commit c8fef899e8
2 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libada/ChangeLog
View File

@ -1,3 +1,8 @@
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> 2012-10-30 Arnaud Charlet <charlet@adacore.com>
* Makefile.in (osconstool): Removed, no longer needed. * Makefile.in (osconstool): Removed, no longer needed.

8
libada/Makefile.in
View File

@ -94,7 +94,7 @@ LIBADA_FLAGS_TO_PASS = \
.PHONY: gnatlib gnatlib-plain gnatlib-sjlj gnatlib-zcx gnatlib-shared osconstool .PHONY: gnatlib gnatlib-plain gnatlib-sjlj gnatlib-zcx gnatlib-shared osconstool
gnatlib: @default_gnatlib_target@ gnatlib: @default_gnatlib_target@
gnatlib-plain: $(GCC_DIR)/ada/Makefile gnatlib-plain: osconstool $(GCC_DIR)/ada/Makefile
test -f stamp-libada || \ test -f stamp-libada || \
$(MAKE) -C $(GCC_DIR)/ada $(LIBADA_FLAGS_TO_PASS) gnatlib \ $(MAKE) -C $(GCC_DIR)/ada $(LIBADA_FLAGS_TO_PASS) gnatlib \
&& touch stamp-libada && touch stamp-libada
@ -103,7 +103,7 @@ gnatlib-plain: $(GCC_DIR)/ada/Makefile
$(LN_S) $(ADA_RTS_DIR) adainclude $(LN_S) $(ADA_RTS_DIR) adainclude
$(LN_S) $(ADA_RTS_DIR) adalib $(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 || \ test -f stamp-libada || \
$(MAKE) -C $(GCC_DIR)/ada $(LIBADA_FLAGS_TO_PASS) $@ \ $(MAKE) -C $(GCC_DIR)/ada $(LIBADA_FLAGS_TO_PASS) $@ \
&& touch stamp-libada && 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) adainclude
$(LN_S) $(ADA_RTS_DIR) adalib $(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 install-gnatlib: $(GCC_DIR)/ada/Makefile
$(MAKE) -C $(GCC_DIR)/ada $(LIBADA_FLAGS_TO_PASS) install-gnatlib $(MAKE) -C $(GCC_DIR)/ada $(LIBADA_FLAGS_TO_PASS) install-gnatlib