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/configure | |
| 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/configure')
| -rwxr-xr-x | libada/configure | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/libada/configure b/libada/configure index 6ec07c4..b5e1827 100755 --- a/libada/configure +++ b/libada/configure @@ -272,7 +272,7 @@ PACKAGE_STRING= PACKAGE_BUGREPORT= ac_unique_file="Makefile.in" -ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS MAINT enable_shared INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os target_noncanonical LN_S x_ada_cflags default_gnatlib_target LIBOBJS LTLIBOBJS' +ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS MAINT enable_shared INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os target_noncanonical LN_S x_ada_cflags default_gnatlib_target default_gnattools_target LIBOBJS LTLIBOBJS' ac_subst_files='' # Initialize some variables set by options. @@ -1556,11 +1556,14 @@ if test $build = $target \ && test ${enable_shared} = yes ; then # Note that build=target is almost certainly the wrong test; FIXME default_gnatlib_target="gnatlib-shared" + default_gnattools_target="gnattools-cross" else default_gnatlib_target="gnatlib-plain" + default_gnattools_target="gnattools-native" fi + # Output: create a Makefile. ac_config_files="$ac_config_files Makefile" @@ -2221,6 +2224,7 @@ s,@target_noncanonical@,$target_noncanonical,;t t s,@LN_S@,$LN_S,;t t s,@x_ada_cflags@,$x_ada_cflags,;t t s,@default_gnatlib_target@,$default_gnatlib_target,;t t +s,@default_gnattools_target@,$default_gnattools_target,;t t s,@LIBOBJS@,$LIBOBJS,;t t s,@LTLIBOBJS@,$LTLIBOBJS,;t t CEOF |