Fix r15-8073 (Pass -macos_version_min to the linker)

With r15-8073-g952e17223d3a98, gcc_cv_ld64_macosx_version_min is being
used for the replacement and being set in a few locations but
gcc_cv_ld64_macos_version_min is set in others.
Since the auto-host.h variable is named LD64_HAS_MACOS_VERSION_MIN,
I changed over to remove the x from the name.

Committed as obvious after a quick test to make sure LD64_HAS_MACOS_VERSION_MIN
was not set to empty.

gcc/ChangeLog:

	* configure: Regenerate.
	* configure.ac: s/gcc_cv_ld64_macosx_version_min/gcc_cv_ld64_macos_version_min/.

Signed-off-by: Andrew Pinski <quic_apinski@quicinc.com>

diff --git a/gcc/configure b/gcc/configure
index 57640f92789f5e6aa4e261cc4c4499f13699d180..0ef47a937603bdfa2a6c7ae17b695b55db89f220 100755 (executable)
--- a/gcc/configure
+++ b/gcc/configure
@@ -32725,12 +32725,12 @@ $as_echo "$gcc_cv_ld64_platform_version" >&6; }
 
     { $as_echo "$as_me:${as_lineno-$LINENO}: checking linker for -macos_version_min" >&5
 $as_echo_n "checking linker for -macos_version_min... " >&6; }
-    gcc_cv_ld64_macosx_version_min=1
+    gcc_cv_ld64_macos_version_min=1
     if $gcc_cv_ld -macos_version_min 10.5 < /dev/null 2>&1 | grep 'unknown option' > /dev/null; then
-      gcc_cv_ld64_macosx_version_min=0
+      gcc_cv_ld64_macos_version_min=0
     fi
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $gcc_cv_ld64_macosx_version_min" >&5
-$as_echo "$gcc_cv_ld64_macosx_version_min" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $gcc_cv_ld64_macos_version_min" >&5
+$as_echo "$gcc_cv_ld64_macos_version_min" >&6; }
   fi
 
   if test x"${gcc_cv_ld64_version}" != x; then
@@ -32761,7 +32761,7 @@ _ACEOF
 
 
 cat >>confdefs.h <<_ACEOF
-#define LD64_HAS_MACOS_VERSION_MIN $gcc_cv_ld64_macosx_version_min
+#define LD64_HAS_MACOS_VERSION_MIN $gcc_cv_ld64_macos_version_min
 _ACEOF
 
 fi

diff --git a/gcc/configure.ac b/gcc/configure.ac
index be77c182f9626f800de653f8686719cc119ff776..4ac419a8a94e94d3e3faf3a9538d2d1f79c300f7 100644 (file)
--- a/gcc/configure.ac
+++ b/gcc/configure.ac
@@ -6422,11 +6422,11 @@ if test x"$ld64_flag" = x"yes"; then
     AC_MSG_RESULT($gcc_cv_ld64_platform_version)
 
     AC_MSG_CHECKING(linker for -macos_version_min)
-    gcc_cv_ld64_macosx_version_min=1
+    gcc_cv_ld64_macos_version_min=1
     if $gcc_cv_ld -macos_version_min 10.5 < /dev/null 2>&1 | grep 'unknown option' > /dev/null; then
-      gcc_cv_ld64_macosx_version_min=0
+      gcc_cv_ld64_macos_version_min=0
     fi
-    AC_MSG_RESULT($gcc_cv_ld64_macosx_version_min)
+    AC_MSG_RESULT($gcc_cv_ld64_macos_version_min)
   fi
 
   if test x"${gcc_cv_ld64_version}" != x; then
@@ -6443,7 +6443,7 @@ if test x"$ld64_flag" = x"yes"; then
   AC_DEFINE_UNQUOTED(LD64_HAS_PLATFORM_VERSION, $gcc_cv_ld64_platform_version,
   [Define to 1 if ld64 supports '-platform_version'.])
 
-  AC_DEFINE_UNQUOTED(LD64_HAS_MACOS_VERSION_MIN, $gcc_cv_ld64_macosx_version_min,
+  AC_DEFINE_UNQUOTED(LD64_HAS_MACOS_VERSION_MIN, $gcc_cv_ld64_macos_version_min,
   [Define to 1 if ld64 supports '-macos_version_min'.])
 fi