From 3b31a906085899ffea090ef9945ffda785dcad78 Mon Sep 17 00:00:00 2001 From: Eric Botcazou Date: Tue, 11 Dec 2018 23:04:39 +0000 Subject: 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 --- libada/ChangeLog | 15 +++++++++++++++ libada/Makefile.in | 23 +++++++---------------- libada/configure | 2 +- libada/configure.ac | 2 +- 4 files changed, 24 insertions(+), 18 deletions(-) (limited to 'libada') diff --git a/libada/ChangeLog b/libada/ChangeLog index 1dcc1b5d2e1..e6f186c47d4 100644 --- a/libada/ChangeLog +++ b/libada/ChangeLog @@ -1,3 +1,18 @@ +2018-12-11 Eric Botcazou + + 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. + 2018-10-31 Joseph Myers PR bootstrap/82856 diff --git a/libada/Makefile.in b/libada/Makefile.in index a2f6afef838..aa6c3273c34 100644 --- a/libada/Makefile.in +++ b/libada/Makefile.in @@ -16,7 +16,7 @@ # . # 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 diff --git a/libada/configure b/libada/configure index 1b056ac44ac..743f98afd8e 100755 --- a/libada/configure +++ b/libada/configure @@ -3264,7 +3264,7 @@ fi if test ${enable_shared} = yes; then default_gnatlib_target="gnatlib-shared" else - default_gnatlib_target="gnatlib-plain" + default_gnatlib_target="gnatlib" fi diff --git a/libada/configure.ac b/libada/configure.ac index 6c7aca01314..6c0bb8bed10 100644 --- a/libada/configure.ac +++ b/libada/configure.ac @@ -129,7 +129,7 @@ AC_PROG_LN_S if test ${enable_shared} = yes; then default_gnatlib_target="gnatlib-shared" else - default_gnatlib_target="gnatlib-plain" + default_gnatlib_target="gnatlib" fi AC_SUBST([default_gnatlib_target]) -- cgit v1.2.3