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: r248787

diff --git a/libada/ChangeLog b/libada/ChangeLog
index 4c642ccce09fd145557e2866120df2233260e4e3..adb2f0b2e077c6ef85cb48ac90109b046423fed5 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.
+
 2016-12-21  Release Manager
 
        * GCC 6.3.0 released.

diff --git a/libada/configure b/libada/configure
index 2296096d4d242fa78ab0e89a626980a0023b63c0..e8e0c27613586cbabf9cf8ea54a2278578218299 100755 (executable)
--- a/libada/configure
+++ b/libada/configure
@@ -2956,9 +2956,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"
@@ -3002,9 +3000,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 04e06fe282167a5e0888c2988f42753fa8708756..3a38c9fd3ecc92cb134a70eeed7daa80125ae411 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,11 +136,12 @@ 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])
 
 # Output: create a Makefile.
 AC_CONFIG_FILES([Makefile])