diff options
author | Nathanael Nerode <neroden@gcc.gnu.org> | 2004-04-24 01:28:02 +0000 |
---|---|---|
committer | Nathanael Nerode <neroden@gcc.gnu.org> | 2004-04-24 01:28:02 +0000 |
commit | e9f4e55723db706a9af5a86549bd18381dfa99ab (patch) | |
tree | 07b4833abf43ecb488823ed0a121943ced4d2ba7 /libada/Makefile.in | |
parent | 77278891d14e6ff888fee7dcb9ae47a9ec33422b (diff) | |
download | gcc-e9f4e55723db706a9af5a86549bd18381dfa99ab.zip gcc-e9f4e55723db706a9af5a86549bd18381dfa99ab.tar.gz gcc-e9f4e55723db706a9af5a86549bd18381dfa99ab.tar.bz2 |
Makefile.in: Revert most of Arnaud's last change.
* Makefile.in: Revert most of Arnaud's last change. Prefer anything
over error-prone Make abuse. Remove temporary debug code.
(gnatlib-zcx): New target.
(gnattools): Split into gnattools-native, gnattools-cross, to fix
previous bug; select which on the basis of default_gnattools_target.
(ada.all.cross): Merged with gnattools-cross target.
* configure.ac: Set default_gnattools_target.
* configure: Regenerate.
From-SVN: r81128
Diffstat (limited to 'libada/Makefile.in')
-rw-r--r-- | libada/Makefile.in | 82 |
1 files changed, 56 insertions, 26 deletions
diff --git a/libada/Makefile.in b/libada/Makefile.in index 5e41f92..7f0ce61 100644 --- a/libada/Makefile.in +++ b/libada/Makefile.in @@ -121,55 +121,80 @@ ADA_TOOLS_FLAGS_TO_PASS=\ .PHONY: gnatlib gnatlib-plain gnatlib-sjlj gnatlib-zcx gnatlib-shared gnatlib: @default_gnatlib_target@ -gnatlib-plain gnatlib-sjlj gnatlib-zcx gnatlib-shared: +gnatlib-plain: $(MAKE) -C $(GCC_DIR)/ada $(FLAGS_TO_PASS) \ GNATLIBFLAGS="$(GNATLIBFLAGS)" \ GNATLIBCFLAGS="$(GNATLIBCFLAGS)" \ TARGET_LIBGCC2_CFLAGS="$(TARGET_LIBGCC2_CFLAGS)" \ THREAD_KIND="$(THREAD_KIND)" \ - TRACE="$(TRACE)" $@ + TRACE="$(TRACE)" \ + gnatlib -.PHONY: rts-zfp rts-ravenscar -rts-zfp rts-ravenscar: +gnatlib-sjlj: $(MAKE) -C $(GCC_DIR)/ada $(FLAGS_TO_PASS) \ - GNATMAKE=../gnatmake-cross $@ + GNATLIBFLAGS="$(GNATLIBFLAGS)" \ + GNATLIBCFLAGS="$(GNATLIBCFLAGS)" \ + TARGET_LIBGCC2_CFLAGS="$(TARGET_LIBGCC2_CFLAGS)" \ + THREAD_KIND="$(THREAD_KIND)" \ + TRACE="$(TRACE)" \ + gnatlib-sjlj -# Rules to build gnattools. -# For cross builds of gnattools, -# put the host RTS dir first in the PATH to hide the default runtime -# files that are among the sources -RTS_DIR:=$(strip $(subst \,/,$(shell gnatls -v | grep adalib ))) +gnatlib-zcx: + $(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-zcx -ifeq ($(build),$(target)) - GNATTOOLS = gnattools-native -else - GNATTOOLS = gnattools-cross -endif +gnatlib-shared: + $(MAKE) -C $(GCC_DIR)/ada $(FLAGS_TO_PASS) \ + GNATLIBFLAGS="$(GNATLIBFLAGS)" \ + GNATLIBCFLAGS="$(GNATLIBCFLAGS)" \ + GNATLIBLDFLAGS="$(GNATLIBLDFLAGS)" \ + TARGET_LIBGCC2_CFLAGS="$(TARGET_LIBGCC2_CFLAGS)" \ + THREAD_KIND="$(THREAD_KIND)" \ + TRACE="$(TRACE)" \ + gnatlib-shared -.PHONY: gnattools regnattools -gnattools: $(GNATTOOLS) +.PHONY: rts-zfp rts-ravenscar +rts-zfp: + $(MAKE) -C $(GCC_DIR)/ada $(FLAGS_TO_PASS) \ + GNATMAKE=../gnatmake-cross \ + rts-zfp + +rts-ravenscar: + $(MAKE) -C $(GCC_DIR)/ada $(FLAGS_TO_PASS) \ + GNATMAKE=../gnatmake-cross \ + rts-ravenscar + +# Rules to build gnattools. +.PHONY: gnattools gnattools-native gnattools-cross regnattools +gnattools: @default_gnattools_target@ gnattools-native: gnatlib $(MAKE) -C $(GCC_DIR)/ada $(FLAGS_TO_PASS) $(ADA_FLAGS_TO_PASS) \ ADA_INCLUDES="-I- -I../rts" \ - CC="../../xgcc -B../../" STAGE_PREFIX=../../ gnattools1 - $(MAKE) -C $(GCC_DIR)/ada $(ADA_TOOLS_FLAGS_TO_PASS) gnattools2 - $(MAKE) -C $(GCC_DIR)/ada $(ADA_TOOLS_FLAGS_TO_PASS) gnattools3 - -regnattools: - $(MAKE) -C $(GCC_DIR)/ada $(ADA_TOOLS_FLAGS_TO_PASS) gnattools1-re + CC="../../xgcc -B../../" STAGE_PREFIX=../../ gnattools1 $(MAKE) -C $(GCC_DIR)/ada $(ADA_TOOLS_FLAGS_TO_PASS) gnattools2 $(MAKE) -C $(GCC_DIR)/ada $(ADA_TOOLS_FLAGS_TO_PASS) gnattools3 +# For cross builds of gnattools, +# put the host RTS dir first in the PATH to hide the default runtime +# files that are among the sources +# FIXME: This should be done in configure. +RTS_DIR:=$(strip $(subst \,/,$(shell gnatls -v | grep adalib ))) gnattools-cross: gnatlib - $(MAKE) -C $(GCC_DIR)/ada $(FLAGS_TO_PASS) $(ADA_FLAGS_TO_PASS) \ + $(MAKE) -C $(GCC_DIR)/ada $(FLAGS_TO_PASS) $(ADA_FLAGS_TO_PASS) \ ADA_INCLUDES="-I$(RTS_DIR)../adainclude -I$(RTS_DIR)" \ GNATMAKE="gnatmake" \ GNATBIND="gnatbind" \ GNATLINK="gnatlink" \ LIBGNAT="" \ gnattools1-re gnattools2 gnattools4 - # rename cross tools, as expected by the GCC makefile when installing + # Rename cross tools to where the GCC makefile wants them when + # installing. FIXME: installation should be done elsewhere. if [ -f $(GCC_DIR)/gnatbind$(exeext) ] ; then \ mv $(GCC_DIR)/gnatbind$(exeext) $(GCC_DIR)/gnatbind-cross$(exeext); \ fi @@ -222,6 +247,11 @@ gnattools-cross: gnatlib mv $(GCC_DIR)/gprcmd$(exeext) $(GCC_DIR)/gprcmd-cross$(exeext); \ fi +regnattools: + $(MAKE) -C $(GCC_DIR)/ada $(ADA_TOOLS_FLAGS_TO_PASS) gnattools1-re + $(MAKE) -C $(GCC_DIR)/ada $(ADA_TOOLS_FLAGS_TO_PASS) gnattools2 + $(MAKE) -C $(GCC_DIR)/ada $(ADA_TOOLS_FLAGS_TO_PASS) gnattools3 + # Check uninstalled version. check: @@ -261,5 +291,5 @@ Makefile: $(srcdir)/Makefile.in config.status config.status: $(srcdir)/configure $(SHELL) ./config.status --recheck -$(srcdir)/configure: @MAINT@ $(srcdir)/configure.in +$(srcdir)/configure: @MAINT@ $(srcdir)/configure.ac cd $(srcdir) && autoconf |