diff options
| author | Eric Botcazou <ebotcazou@gcc.gnu.org> | 2018-12-11 23:04:39 +0000 |
|---|---|---|
| committer | Eric Botcazou <ebotcazou@gcc.gnu.org> | 2018-12-11 23:04:39 +0000 |
| commit | 3b31a906085899ffea090ef9945ffda785dcad78 (patch) | |
| tree | 999a51362e3680534f9080d66c4c7db477a7f213 /libada/Makefile.in | |
| parent | be68937be28ad63bd6f7a75d0fa5c851ba4afc2b (diff) | |
| download | gcc-3b31a906085899ffea090ef9945ffda785dcad78.zip gcc-3b31a906085899ffea090ef9945ffda785dcad78.tar.gz gcc-3b31a906085899ffea090ef9945ffda785dcad78.tar.bz2 | |
re PR ada/88429 (libada build fails with --disable-shared)
libada/
PR ada/88429
* configure.ac (default_gnatlib_target): Set to gnatlib instead of
gnatlib-plain if --disable-shared.
* configure: Regenerate.
* Makefile.in (all): Replace gnatlib prerequisite with libada.
(ADA_RTS_SUBDIR): Delete.
(libada): New target, renamed from...
(gnatlib): ...this. Merge with other library targets.
(gnatlib-plain): Delete.
(install-gnatlib): Rename to...
(install-libada): ...this.
(install): Replace install-gnatlib prerequisite with install-libada.
gcc/ada/
PR ada/88429
* gcc-interface/Makefile.in (./stamp-gnatlib1-$(RTSDIR)): Also pass
MULTISUBDIR to sub-make and add quotes around $(THREAD_KIND).
(gnatlib-shared-dual): Also pass PICFLAG_FOR_TARGET to sub-make.
(gnatlib-sjlj): Also pass MULTISUBDIR to sub-make, but do not pass
PICFLAG_FOR_TARGET.
(gnatlib-zcx): Likewise.
From-SVN: r267034
Diffstat (limited to 'libada/Makefile.in')
| -rw-r--r-- | libada/Makefile.in | 23 |
1 files changed, 7 insertions, 16 deletions
diff --git a/libada/Makefile.in b/libada/Makefile.in index a2f6afe..aa6c327 100644 --- a/libada/Makefile.in +++ b/libada/Makefile.in @@ -16,7 +16,7 @@ # <http://www.gnu.org/licenses/>. # Default target; must be first. -all: gnatlib +all: libada $(MULTIDO) $(AM_MAKEFLAGS) DO=all multi-do # $(MAKE) .PHONY: all @@ -70,7 +70,6 @@ target_noncanonical:=@target_noncanonical@ version := $(shell @get_gcc_base_ver@ $(srcdir)/../gcc/BASE-VER) libsubdir := $(libdir)/gcc/$(target_noncanonical)/$(version)$(MULTISUBDIR) ADA_RTS_DIR=$(GCC_DIR)/ada/rts$(subst /,_,$(MULTISUBDIR)) -ADA_RTS_SUBDIR=./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 @@ -96,20 +95,12 @@ LIBADA_FLAGS_TO_PASS = \ "GCC_FOR_TARGET=$(CC)" \ "CFLAGS=$(CFLAGS)" -# Rules to build gnatlib. -.PHONY: gnatlib gnatlib-plain gnatlib-sjlj gnatlib-zcx gnatlib-shared osconstool -gnatlib: @default_gnatlib_target@ +.PHONY: libada gnatlib gnatlib-shared gnatlib-sjlj gnatlib-zcx osconstool -gnatlib-plain: osconstool $(GCC_DIR)/ada/Makefile - test -f stamp-libada || \ - $(MAKE) -C $(GCC_DIR)/ada $(LIBADA_FLAGS_TO_PASS) gnatlib \ - && touch stamp-libada - -rm -rf adainclude - -rm -rf adalib - $(LN_S_RECURSIVE) $(ADA_RTS_DIR) adainclude - $(LN_S_RECURSIVE) $(ADA_RTS_DIR) adalib +# Rules to build and install libada. +libada: @default_gnatlib_target@ -gnatlib-sjlj gnatlib-zcx gnatlib-shared: osconstool $(GCC_DIR)/ada/Makefile +gnatlib gnatlib-shared gnatlib-sjlj gnatlib-zcx: osconstool $(GCC_DIR)/ada/Makefile test -f stamp-libada || \ $(MAKE) -C $(GCC_DIR)/ada $(LIBADA_FLAGS_TO_PASS) $@ \ && touch stamp-libada @@ -121,7 +112,7 @@ gnatlib-sjlj gnatlib-zcx gnatlib-shared: osconstool $(GCC_DIR)/ada/Makefile osconstool: $(MAKE) -C $(GCC_DIR)/ada $(LIBADA_FLAGS_TO_PASS) ./bldtools/oscons/xoscons -install-gnatlib: $(GCC_DIR)/ada/Makefile +install-libada: $(GCC_DIR)/ada/Makefile $(MAKE) -C $(GCC_DIR)/ada $(LIBADA_FLAGS_TO_PASS) install-gnatlib # Check uninstalled version. @@ -148,7 +139,7 @@ TAGS: .PHONY: check installcheck info dvi pdf html # Installation rules. -install: install-gnatlib +install: install-libada $(MULTIDO) $(AM_MAKEFLAGS) DO=install multi-do # $(MAKE) install-strip: install |