From c6d01ef8ca2f24527046f29a563e07a071e587b3 Mon Sep 17 00:00:00 2001 From: Iain Sandoe Date: Mon, 28 Nov 2016 10:29:19 +0000 Subject: [PATCH] [Darwin, config] Fix version number extraction to portable method The method used in the applied patch caused configuration errors on freeBSD and hppa. 2016-11-28 Iain Sandoe PR target/71767 * configure.ac (with_ld64): Use portable method to extract the major part of the version number. * configure: Regenerated. From-SVN: r242912 --- gcc/ChangeLog | 7 +++++++ gcc/configure | 7 ++++--- gcc/configure.ac | 4 ++-- 3 files changed, 13 insertions(+), 5 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 73c23fc3a58..ef01a7fb7bc 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,10 @@ +2016-11-28 Iain Sandoe + + PR target/71767 + * configure.ac (with_ld64): Use portable method to extract the + major part of the version number. + * configure: Regenerated. + 2016-11-28 Jakub Jelinek * gimple-ssa-sprintf.c (build_intmax_type_nodes): Look at diff --git a/gcc/configure b/gcc/configure index 90f9e8977fd..b9a39d3454e 100755 --- a/gcc/configure +++ b/gcc/configure @@ -24510,6 +24510,7 @@ if test $gcc_cv_as_mmacosx_version_min = yes; then $as_echo "#define HAVE_AS_MMACOSX_VERSION_MIN_OPTION 1" >>confdefs.h fi + ;; esac @@ -28355,9 +28356,9 @@ if test x"$ld64_flag" = x"yes"; then # If the configurer specified a minimum ld64 version to be supported, then use # that to determine feature support. if test x"${gcc_cv_ld64_version}" != x; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking ld64 major version" >&5 -$as_echo_n "checking ld64 major version... " >&6; } - IFS=. read gcc_cv_ld64_major gcc_cv_ld64_minor <<< "${gcc_cv_ld64_version}" + { $as_echo "$as_me:${as_lineno-$LINENO}: checking ld64 specified version" >&5 +$as_echo_n "checking ld64 specified version... " >&6; } + gcc_cv_ld64_major=`echo "$gcc_cv_ld64_version" | sed -e 's/\..*//'` { $as_echo "$as_me:${as_lineno-$LINENO}: result: $gcc_cv_ld64_major" >&5 $as_echo "$gcc_cv_ld64_major" >&6; } if test "$gcc_cv_ld64_major" -ge 236; then diff --git a/gcc/configure.ac b/gcc/configure.ac index b2798e78db7..268efdb3021 100644 --- a/gcc/configure.ac +++ b/gcc/configure.ac @@ -5309,8 +5309,8 @@ if test x"$ld64_flag" = x"yes"; then # If the configurer specified a minimum ld64 version to be supported, then use # that to determine feature support. if test x"${gcc_cv_ld64_version}" != x; then - AC_MSG_CHECKING(ld64 major version) - IFS=. read gcc_cv_ld64_major gcc_cv_ld64_minor <<< "${gcc_cv_ld64_version}" + AC_MSG_CHECKING(ld64 specified version) + gcc_cv_ld64_major=`echo "$gcc_cv_ld64_version" | sed -e 's/\..*//'` AC_MSG_RESULT($gcc_cv_ld64_major) if test "$gcc_cv_ld64_major" -ge 236; then gcc_cv_ld64_export_dynamic=1 -- 2.30.2