summaryrefslogtreecommitdiff
path: root/libada
diff options
context:
space:
mode:
authorguerby <guerby@138bc75d-0d04-0410-961f-82ee72b054a4>2009-04-06 20:18:10 +0000
committerguerby <guerby@138bc75d-0d04-0410-961f-82ee72b054a4>2009-04-06 20:18:10 +0000
commit4b095fbdc9344cf52bcee14f286b6ba65d2ec8ba (patch)
tree78063b9076f90c585f15c544b3916e71303a142b /libada
parent4992c81abcdb7e3661d82cf9c14cdfbc23f62aa1 (diff)
downloadgcc-4b095fbdc9344cf52bcee14f286b6ba65d2ec8ba.tar.gz
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. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@145622 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libada')
-rw-r--r--libada/ChangeLog5
-rw-r--r--libada/Makefile.in5
2 files changed, 10 insertions, 0 deletions
diff --git a/libada/ChangeLog b/libada/ChangeLog
index 55766736d33..a58617b1c3e 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 2c568688609..b819dfcccfd 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