diff options
| author | ebotcazou <ebotcazou@138bc75d-0d04-0410-961f-82ee72b054a4> | 2017-06-01 10:51:50 +0000 |
|---|---|---|
| committer | ebotcazou <ebotcazou@138bc75d-0d04-0410-961f-82ee72b054a4> | 2017-06-01 10:51:50 +0000 |
| commit | a3ea1ef1ca26e00a66ff580159270bb2b7222b1c (patch) | |
| tree | 8504e33d062c959328d3be86652f440ea9177fd9 /libada | |
| parent | 0386aabb4d03622488be8ceadae65228ceefec59 (diff) | |
PR ada/80921
* configure.ac (default_gnatlib_target): Remove bogus condition.
(have_getipinfo): Tweak.
* configure: Regenerate.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/gcc-7-branch@248786 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libada')
| -rw-r--r-- | libada/ChangeLog | 9 | ||||
| -rwxr-xr-x | libada/configure | 7 | ||||
| -rw-r--r-- | libada/configure.ac | 9 |
3 files changed, 15 insertions, 10 deletions
diff --git a/libada/ChangeLog b/libada/ChangeLog index d0afcea554ae..607b7ba959a9 100644 --- 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-02 Release Manager * GCC 7.1.0 released. @@ -8,7 +15,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 5ab0e211aa0e..17a52c81db28 100755 --- a/libada/configure +++ b/libada/configure @@ -2960,9 +2960,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" @@ -3006,9 +3004,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 3e0f0a352104..0020df9d4637 100644 --- 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]) # Determine what GCC version number to use in filesystem paths. GCC_BASE_VER |