diff options
author | Nathanael Nerode <neroden@gcc.gnu.org> | 2004-04-05 04:38:09 +0000 |
---|---|---|
committer | Nathanael Nerode <neroden@gcc.gnu.org> | 2004-04-05 04:38:09 +0000 |
commit | cecb6b56e1d86d505bff8e93e81bb9c33bbe86c6 (patch) | |
tree | 459d224f67d42276bc04f4a545e56dd1f5fe7c24 | |
parent | ae345763e1e73edfe67b3d0a78149384cfc22c7b (diff) |
(gcc)libada-branch
* libada-mk.in: Record xmake_file as well.
(libada)
* Makefile.in: Use GCC xmake_file.
git-svn-id: https://gcc.gnu.org/svn/gcc/branches/libada-branch@80426 138bc75d-0d04-0410-961f-82ee72b054a4
-rw-r--r-- | gcc/ChangeLog.libada | 2 | ||||
-rw-r--r-- | gcc/libada-mk.in | 1 | ||||
-rw-r--r-- | libada/ChangeLog.libada | 2 | ||||
-rw-r--r-- | libada/Makefile.in | 6 |
4 files changed, 11 insertions, 0 deletions
diff --git a/gcc/ChangeLog.libada b/gcc/ChangeLog.libada index 3c93e0b2782..abf02ff6992 100644 --- a/gcc/ChangeLog.libada +++ b/gcc/ChangeLog.libada @@ -1,5 +1,7 @@ 2004-03-31 Nathanael Nerode <neroden@gcc.gnu.org> + * libada-mk.in: Record xmake_file as well. + * libada-mk.in: Set exeext, not host_exeext. * configure.ac: Create libada-mk from libada-mk.in. diff --git a/gcc/libada-mk.in b/gcc/libada-mk.in index 260a3ac5b6f..2dd85c9fd54 100644 --- a/gcc/libada-mk.in +++ b/gcc/libada-mk.in @@ -28,6 +28,7 @@ NOCOMMON_FLAG=@nocommon_flag@ WARN_CFLAGS=@warn_cflags@ cc_set_by_configure=@cc_set_by_configure@ gcc_tmake_file=@tmake_file@ +gcc_xmake_file=@xmake_file@ # This really shouldn't be needed, but for now... CC=@CC@ diff --git a/libada/ChangeLog.libada b/libada/ChangeLog.libada index 42c5ac97a28..23792f66135 100644 --- a/libada/ChangeLog.libada +++ b/libada/ChangeLog.libada @@ -1,5 +1,7 @@ 2004-04-04 Nathanael Nerode <neroden@gcc.gnu.org> + * Makefile.in: Use GCC xmake_file. + * Makefile.in: Add rts-zfp, rts-ravenscar targets from gcc/ada/Make-lang.in. diff --git a/libada/Makefile.in b/libada/Makefile.in index 4102fe70ab3..5af0d5186bc 100644 --- a/libada/Makefile.in +++ b/libada/Makefile.in @@ -79,6 +79,12 @@ ifneq ($(tmake_file),) include $(tmake_file) endif +# Get possible host-specific override for libsubdir (ick). +xmake_file=$(subst /config,/../gcc/config,$(gcc_xmake_file)) +ifneq ($(xmake_file),) +include $(xmake_file) +endif + FLAGS_TO_PASS = \ "MAKEOVERRIDES=" \ "LDFLAGS=$(LDFLAGS)" \ |