re PR ada/80921 (cross compiling fails to build Ada shared libraries)

	PR ada/80921
	* configure.ac (default_gnatlib_target): Remove bogus condition.
	(have_getipinfo): Tweak.
	* configure: Regenerate.

From-SVN: r248785

diff --git a/libada/ChangeLog b/libada/ChangeLog
index 891637b..9ddec46 100644 (file)
--- a/libada/ChangeLog
+++ b/libada/ChangeLog
@@ -1,3 +1,10 @@
+2017-06-01  Eric Botcazou  <ebotcazou@adacore.com>
+
+       PR ada/80921
+       * configure.ac (default_gnatlib_target): Remove bogus condition.
+       (have_getipinfo): Tweak.
+       * configure: Regenerate.
+
 2017-05-22  Eric Botcazou  <ebotcazou@adacore.com>
 
        * configure.ac: Add check for sys/capability.h header.
@@ -11,7 +18,7 @@
        * configure.ac: Add GCC_BASE_VER.
        * Makefile.in (version): Use @get_gcc_base_ver@ instead of cat to get
        version from BASE-VER file.
-       * configure: Regenerated.
+       * configure: Regenerate.
 
 2017-01-04  Alan Modra  <amodra@gmail.com>
 

diff --git a/libada/configure b/libada/configure
index 78b9245..76b3992 100755 (executable)
--- a/libada/configure
+++ b/libada/configure
@@ -3201,9 +3201,7 @@ fi
 
 
 # Determine what to build for 'gnatlib'
-if test $build = $target \
-   && test ${enable_shared} = yes ; then
-  # Note that build=target is almost certainly the wrong test; FIXME
+if test ${enable_shared} = yes; then
   default_gnatlib_target="gnatlib-shared"
 else
   default_gnatlib_target="gnatlib-plain"
@@ -3247,9 +3245,10 @@ $as_echo "#define HAVE_GETIPINFO 1" >>confdefs.h
 
   fi
 
-have_getipinfo=
 if test x$have_unwind_getipinfo = xyes; then
   have_getipinfo=-DHAVE_GETIPINFO
+else
+  have_getipinfo=
 fi
 
 

diff --git a/libada/configure.ac b/libada/configure.ac
index f990a07..bcab984 100644 (file)
--- a/libada/configure.ac
+++ b/libada/configure.ac
@@ -127,9 +127,7 @@ AC_PROG_AWK
 AC_PROG_LN_S
 
 # Determine what to build for 'gnatlib'
-if test $build = $target \
-   && test ${enable_shared} = yes ; then
-  # Note that build=target is almost certainly the wrong test; FIXME
+if test ${enable_shared} = yes; then
   default_gnatlib_target="gnatlib-shared"
 else
   default_gnatlib_target="gnatlib-plain"
@@ -138,15 +136,16 @@ AC_SUBST([default_gnatlib_target])
 
 # Check for _Unwind_GetIPInfo
 GCC_CHECK_UNWIND_GETIPINFO
-have_getipinfo=
 if test x$have_unwind_getipinfo = xyes; then
   have_getipinfo=-DHAVE_GETIPINFO
+else
+  have_getipinfo=
 fi
-AC_SUBST(have_getipinfo)
+AC_SUBST([have_getipinfo])
 
 # Check for <sys/capability.h>
 AC_CHECK_HEADER([sys/capability.h], have_capability=-DHAVE_CAPABILITY, have_capability=)
-AC_SUBST(have_capability)
+AC_SUBST([have_capability])
 
 # Determine what GCC version number to use in filesystem paths.
 GCC_BASE_VER