Skip to content

Commit fc728cf

Browse files
committed
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>
1 parent b5d8289 commit fc728cf

File tree

2 files changed

+9
-9
lines changed

2 files changed

+9
-9
lines changed

gcc/configure

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -32725,12 +32725,12 @@ $as_echo "$gcc_cv_ld64_platform_version" >&6; }
3272532725

3272632726
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking linker for -macos_version_min" >&5
3272732727
$as_echo_n "checking linker for -macos_version_min... " >&6; }
32728-
gcc_cv_ld64_macosx_version_min=1
32728+
gcc_cv_ld64_macos_version_min=1
3272932729
if $gcc_cv_ld -macos_version_min 10.5 < /dev/null 2>&1 | grep 'unknown option' > /dev/null; then
32730-
gcc_cv_ld64_macosx_version_min=0
32730+
gcc_cv_ld64_macos_version_min=0
3273132731
fi
32732-
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gcc_cv_ld64_macosx_version_min" >&5
32733-
$as_echo "$gcc_cv_ld64_macosx_version_min" >&6; }
32732+
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gcc_cv_ld64_macos_version_min" >&5
32733+
$as_echo "$gcc_cv_ld64_macos_version_min" >&6; }
3273432734
fi
3273532735

3273632736
if test x"${gcc_cv_ld64_version}" != x; then
@@ -32761,7 +32761,7 @@ _ACEOF
3276132761

3276232762

3276332763
cat >>confdefs.h <<_ACEOF
32764-
#define LD64_HAS_MACOS_VERSION_MIN $gcc_cv_ld64_macosx_version_min
32764+
#define LD64_HAS_MACOS_VERSION_MIN $gcc_cv_ld64_macos_version_min
3276532765
_ACEOF
3276632766

3276732767
fi

gcc/configure.ac

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6422,11 +6422,11 @@ if test x"$ld64_flag" = x"yes"; then
64226422
AC_MSG_RESULT($gcc_cv_ld64_platform_version)
64236423

64246424
AC_MSG_CHECKING(linker for -macos_version_min)
6425-
gcc_cv_ld64_macosx_version_min=1
6425+
gcc_cv_ld64_macos_version_min=1
64266426
if $gcc_cv_ld -macos_version_min 10.5 < /dev/null 2>&1 | grep 'unknown option' > /dev/null; then
6427-
gcc_cv_ld64_macosx_version_min=0
6427+
gcc_cv_ld64_macos_version_min=0
64286428
fi
6429-
AC_MSG_RESULT($gcc_cv_ld64_macosx_version_min)
6429+
AC_MSG_RESULT($gcc_cv_ld64_macos_version_min)
64306430
fi
64316431

64326432
if test x"${gcc_cv_ld64_version}" != x; then
@@ -6443,7 +6443,7 @@ if test x"$ld64_flag" = x"yes"; then
64436443
AC_DEFINE_UNQUOTED(LD64_HAS_PLATFORM_VERSION, $gcc_cv_ld64_platform_version,
64446444
[Define to 1 if ld64 supports '-platform_version'.])
64456445

6446-
AC_DEFINE_UNQUOTED(LD64_HAS_MACOS_VERSION_MIN, $gcc_cv_ld64_macosx_version_min,
6446+
AC_DEFINE_UNQUOTED(LD64_HAS_MACOS_VERSION_MIN, $gcc_cv_ld64_macos_version_min,
64476447
[Define to 1 if ld64 supports '-macos_version_min'.])
64486448
fi
64496449

0 commit comments

Comments
 (0)