This is the mail archive of the
gcc-patches@gcc.gnu.org
mailing list for the GCC project.
Re: [PATH][Ada] Fix multilib handling of gnat.dg when RUNTESTFLAGS is used
- From: Paolo Bonzini <bonzini at gnu dot org>
- To: Laurent GUERBY <laurent at guerby dot net>
- Cc: gcc-patches <gcc-patches at gcc dot gnu dot org>, Janis Johnson <janis187 at us dot ibm dot com>, Arnaud Charlet <charlet at adacore dot com>
- Date: Thu, 05 Mar 2009 12:21:58 +0100
- Subject: Re: [PATH][Ada] Fix multilib handling of gnat.dg when RUNTESTFLAGS is used
- References: <1236247879.11347.1296.camel@localhost>
> * Makefile.in (ADA_RTS_DIR): Define.
> * Makefile.in (gnatlib-*): Use.
Something like "link adainclude and adalib to it" would be more
intuitive. :-)
> Index: libada/Makefile.in
> ===================================================================
> --- libada/Makefile.in (revision 144573)
> +++ libada/Makefile.in (working copy)
> @@ -65,6 +65,7 @@
> 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 @@
> 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
I am not sure that symbolic links to directories are okay on all
platforms where Ada is supported (especially MinGW).
If they are, this part of the patch is okay.
Paolo