aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNathanael Nerode <neroden@gcc.gnu.org>2004-04-25 21:29:37 +0000
committerNathanael Nerode <neroden@gcc.gnu.org>2004-04-25 21:29:37 +0000
commitd743b2b6b10e83fa4b0fd794e764a5dec01c9094 (patch)
tree4559985556679c748650ecad6730f735d59bb8b1
parent060c5f005e19938ff900cc653af1a46947b91d1d (diff)
downloadgcc-d743b2b6b10e83fa4b0fd794e764a5dec01c9094.zip
gcc-d743b2b6b10e83fa4b0fd794e764a5dec01c9094.tar.gz
gcc-d743b2b6b10e83fa4b0fd794e764a5dec01c9094.tar.bz2
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
-rw-r--r--libada/ChangeLog6
-rwxr-xr-xlibada/configure10
-rw-r--r--libada/configure.ac10
3 files changed, 22 insertions, 4 deletions
diff --git a/libada/ChangeLog b/libada/ChangeLog
index 796a3e4..02abac7 100644
--- a/libada/ChangeLog
+++ b/libada/ChangeLog
@@ -1,5 +1,11 @@
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
over error-prone Make abuse. Remove temporary debug code.
(gnatlib-zcx): New target.
diff --git a/libada/configure b/libada/configure
index b5e1827..1d5e30d 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 eaa50b8..1b52698 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.