diff options
| author | Laurent GUERBY <laurent@guerby.net> | 2009-04-06 20:18:10 +0000 |
|---|---|---|
| committer | Laurent Guerby <guerby@gcc.gnu.org> | 2009-04-06 20:18:10 +0000 |
| commit | 6d63ea7513c766c1d45e167fe827ac4bd680aac6 (patch) | |
| tree | 78063b9076f90c585f15c544b3916e71303a142b /libada | |
| parent | ea0a374b2c55421c111b401ba73bd45230599c07 (diff) | |
| download | gcc-6d63ea7513c766c1d45e167fe827ac4bd680aac6.zip gcc-6d63ea7513c766c1d45e167fe827ac4bd680aac6.tar.gz gcc-6d63ea7513c766c1d45e167fe827ac4bd680aac6.tar.bz2 | |
gnat.exp: Handle multilib.
testsuite/
2009-04-06 Laurent GUERBY <laurent@guerby.net>
* lib/gnat.exp: Handle multilib.
libada/
2009-04-06 Laurent GUERBY <laurent@guerby.net>
* Makefile.in (ADA_RTS_DIR): Define.
* Makefile.in (gnatlib-*): Link adainclude and adalib to it.
From-SVN: r145622
Diffstat (limited to 'libada')
| -rw-r--r-- | libada/ChangeLog | 5 | ||||
| -rw-r--r-- | libada/Makefile.in | 5 |
2 files changed, 10 insertions, 0 deletions
diff --git a/libada/ChangeLog b/libada/ChangeLog index 5576673..a58617b 100644 --- a/libada/ChangeLog +++ b/libada/ChangeLog @@ -1,3 +1,8 @@ +2009-04-06 Laurent GUERBY <laurent@guerby.net> + + * Makefile.in (ADA_RTS_DIR): Define. + * Makefile.in (gnatlib-*): Link adainclude and adalib to it. + 2008-09-21 Laurent Guerby <laurent@guerby.net> Paolo Bonzini <bonzini@gnu.org> diff --git a/libada/Makefile.in b/libada/Makefile.in index 2c56868..b819dfc 100644 --- a/libada/Makefile.in +++ b/libada/Makefile.in @@ -65,6 +65,7 @@ include $(GCC_DIR)/libgcc.mvars target_noncanonical:=@target_noncanonical@ version := $(shell cat $(srcdir)/../gcc/BASE-VER) libsubdir := $(libdir)/gcc/$(target_noncanonical)/$(version)$(MULTISUBDIR) +ADA_RTS_DIR=$(GCC_DIR)/ada/rts$(subst /,_,$(MULTISUBDIR)) # exeext should not be used because it's the *host* exeext. We're building # a *target* library, aren't we?!? Likewise for CC. Still, provide bogus @@ -97,11 +98,15 @@ gnatlib-plain: oscons $(GCC_DIR)/ada/Makefile test -f stamp-libada || \ $(MAKE) -C $(GCC_DIR)/ada $(LIBADA_FLAGS_TO_PASS) gnatlib \ && touch stamp-libada + $(LN_S) $(ADA_RTS_DIR) adainclude + $(LN_S) $(ADA_RTS_DIR) adalib gnatlib-sjlj gnatlib-zcx gnatlib-shared: oscons $(GCC_DIR)/ada/Makefile test -f stamp-libada || \ $(MAKE) -C $(GCC_DIR)/ada $(LIBADA_FLAGS_TO_PASS) $@ \ && touch stamp-libada + $(LN_S) $(ADA_RTS_DIR) adainclude + $(LN_S) $(ADA_RTS_DIR) adalib oscons: $(MAKE) -C $(GCC_DIR) $(LIBADA_FLAGS_TO_PASS) ada/s-oscons.ads |