aboutsummaryrefslogtreecommitdiff
path: root/libada
diff options
context:
space:
mode:
authorLaurent GUERBY <laurent@guerby.net>2008-08-29 13:44:25 +0000
committerLaurent Guerby <guerby@gcc.gnu.org>2008-08-29 13:44:25 +0000
commitf62b28a93b8c2775fc73315cdc1886fcc8afd80a (patch)
tree55c616970c63c3648373c6641b227d16a0ad31da /libada
parentb1d78dfca1180c48bc47e762b405cc7c53897d44 (diff)
downloadgcc-f62b28a93b8c2775fc73315cdc1886fcc8afd80a.zip
gcc-f62b28a93b8c2775fc73315cdc1886fcc8afd80a.tar.gz
gcc-f62b28a93b8c2775fc73315cdc1886fcc8afd80a.tar.bz2
Makefile.in (FLAGS_TO_PASS): renamed to LIBADA_FLAGS_TO_PASS to avoid conflicts.
2008-08-29 Laurent Guerby <laurent@guerby.net> * Makefile.in (FLAGS_TO_PASS): renamed to LIBADA_FLAGS_TO_PASS to avoid conflicts. Factor more flags to pass. (libsubdir): New variable. (install-gnatlib): New target. From-SVN: r139767
Diffstat (limited to 'libada')
-rw-r--r--libada/ChangeLog7
-rw-r--r--libada/Makefile.in34
2 files changed, 24 insertions, 17 deletions
diff --git a/libada/ChangeLog b/libada/ChangeLog
index 891d9b1..4f1c821 100644
--- a/libada/ChangeLog
+++ b/libada/ChangeLog
@@ -1,3 +1,10 @@
+2008-08-29 Laurent Guerby <laurent@guerby.net>
+
+ * Makefile.in (FLAGS_TO_PASS): renamed to LIBADA_FLAGS_TO_PASS to
+ avoid conflicts. Factor more flags to pass.
+ (libsubdir): New variable.
+ (install-gnatlib): New target.
+
2008-08-28 Laurent Guerby <laurent@guerby.net>
* configure: Regenerate.
diff --git a/libada/Makefile.in b/libada/Makefile.in
index 01759f3..05a4233 100644
--- a/libada/Makefile.in
+++ b/libada/Makefile.in
@@ -51,15 +51,25 @@ host_subdir = @host_subdir@
GCC_DIR=../../$(host_subdir)/gcc
include $(GCC_DIR)/libgcc.mvars
+target_noncanonical:=@target_noncanonical@
+version := $(shell cat $(srcdir)/../gcc/BASE-VER)
+libsubdir := $(libdir)/gcc/$(target_noncanonical)/$(version)
+
# 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
# definitions just in case something slips through the safety net provided
# by recursive make invocations in gcc/ada/Makefile.in
-FLAGS_TO_PASS = \
+LIBADA_FLAGS_TO_PASS = \
"MAKEOVERRIDES=" \
"LDFLAGS=$(LDFLAGS)" \
"LN_S=$(LN_S)" \
"SHELL=$(SHELL)" \
+ "GNATLIBFLAGS=$(GNATLIBFLAGS)" \
+ "GNATLIBCFLAGS=$(GNATLIBCFLAGS)" \
+ "TARGET_LIBGCC2_CFLAGS=$(TARGET_LIBGCC2_CFLAGS)" \
+ "THREAD_KIND=$(THREAD_KIND)" \
+ "TRACE=$(TRACE)" \
+ "libsubdir=$(libsubdir)" \
"objext=$(objext)" \
"prefix=$(prefix)" \
"exeext=.exeext.should.not.be.used " \
@@ -73,29 +83,19 @@ gnatlib: @default_gnatlib_target@
gnatlib-plain: oscons $(GCC_DIR)/ada/Makefile
test -f stamp-libada || \
- $(MAKE) -C $(GCC_DIR)/ada $(FLAGS_TO_PASS) \
- GNATLIBFLAGS="$(GNATLIBFLAGS)" \
- GNATLIBCFLAGS="$(GNATLIBCFLAGS)" \
- TARGET_LIBGCC2_CFLAGS="$(TARGET_LIBGCC2_CFLAGS)" \
- THREAD_KIND="$(THREAD_KIND)" \
- TRACE="$(TRACE)" \
- gnatlib \
+ $(MAKE) -C $(GCC_DIR)/ada $(LIBADA_FLAGS_TO_PASS) gnatlib \
&& touch stamp-libada
gnatlib-sjlj gnatlib-zcx gnatlib-shared: oscons $(GCC_DIR)/ada/Makefile
test -f stamp-libada || \
- $(MAKE) -C $(GCC_DIR)/ada $(FLAGS_TO_PASS) \
- GNATLIBFLAGS="$(GNATLIBFLAGS)" \
- GNATLIBCFLAGS="$(GNATLIBCFLAGS)" \
- TARGET_LIBGCC2_CFLAGS="$(TARGET_LIBGCC2_CFLAGS)" \
- THREAD_KIND="$(THREAD_KIND)" \
- TRACE="$(TRACE)" \
- $@ \
+ $(MAKE) -C $(GCC_DIR)/ada $(LIBADA_FLAGS_TO_PASS) $@ \
&& touch stamp-libada
oscons:
- $(MAKE) -C $(GCC_DIR) THREAD_KIND="$(THREAD_KIND)" \
- $(FLAGS_TO_PASS) ada/s-oscons.ads
+ $(MAKE) -C $(GCC_DIR) $(LIBADA_FLAGS_TO_PASS) ada/s-oscons.ads
+
+install-gnatlib: $(GCC_DIR)/ada/Makefile
+ $(MAKE) -C $(GCC_DIR)/ada $(LIBADA_FLAGS_TO_PASS) install-gnatlib
# Check uninstalled version.
check: