From d743b2b6b10e83fa4b0fd794e764a5dec01c9094 Mon Sep 17 00:00:00 2001 From: Nathanael Nerode <neroden@gcc.gnu.org> Date: Sun, 25 Apr 2004 21:29:37 +0000 Subject: [PATCH] configure.ac: Fix stupid brain-fade; set default_gnattools_target correctly. * configure.ac: Fix stupid brain-fade; set default_gnattools_target correctly. * configure: Regenerate. From-SVN: r81167 --- libada/ChangeLog | 6 ++++++ libada/configure | 10 ++++++++-- libada/configure.ac | 10 ++++++++-- 3 files changed, 22 insertions(+), 4 deletions(-) diff --git a/libada/ChangeLog b/libada/ChangeLog index 796a3e4ba8f9..02abac72fc6d 100644 --- a/libada/ChangeLog +++ b/libada/ChangeLog @@ -1,3 +1,9 @@ +2004-04-19 Nathanael Nerode <neroden@gcc.gnu.org> + + * configure.ac: Fix stupid brain-fade; set default_gnattools_target + correctly. + * configure: Regenerate. + 2004-04-19 Nathanael Nerode <neroden@gcc.gnu.org> * Makefile.in: Revert most of Arnaud's last change. Prefer anything diff --git a/libada/configure b/libada/configure index b5e1827717ec..1d5e30da9d56 100755 --- a/libada/configure +++ b/libada/configure @@ -1556,13 +1556,19 @@ 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 +# Determine what to build for 'gnattools' +if test $build = $target ; then + # Note that build=target is almost certainly the wrong test; FIXME + default_gnattools_target="gnattools-native" +else + default_gnattools_target="gnattools-cross" +fi + # Output: create a Makefile. ac_config_files="$ac_config_files Makefile" diff --git a/libada/configure.ac b/libada/configure.ac index eaa50b864418..1b52698cd7ae 100644 --- a/libada/configure.ac +++ b/libada/configure.ac @@ -81,12 +81,18 @@ 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 AC_SUBST([default_gnatlib_target]) + +# Determine what to build for 'gnattools' +if test $build = $target ; then + # Note that build=target is almost certainly the wrong test; FIXME + default_gnattools_target="gnattools-native" +else + default_gnattools_target="gnattools-cross" +fi AC_SUBST([default_gnattools_target]) # Output: create a Makefile. -- GitLab