Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

macOS: Remove version check in configure script #2871

Merged
merged 1 commit into from
Nov 19, 2020
Merged

macOS: Remove version check in configure script #2871

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
44 changes: 0 additions & 44 deletions make/configure.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -387,50 +387,6 @@ if test X${enable_native_libs} = Xyes -a X${enable_hipe} != Xno; then
fi
AC_SUBST(NATIVE_LIBS_ENABLED)

if test $CROSS_COMPILING = no; then
case $host_os in
darwin*)
macosx_version=`sw_vers -productVersion`
test $? -eq 0 || {
AC_MSG_ERROR([Failed to execute 'sw_vers'; please provide it in PATH])
}
[case "$macosx_version" in
[1-9][0-9].[0-9])
int_macosx_version=`echo $macosx_version | sed 's|\([^\.]*\)\.\([^\.]*\)|\10\200|'`;;
[1-9][0-9].[0-9].[0-9])
int_macosx_version=`echo $macosx_version | sed 's|\([^\.]*\)\.\([^\.]*\)\.\([^\.]*\)|\10\20\3|'`;;
[1-9][0-9].[1-9][0-9])
int_macosx_version=`echo $macosx_version | sed 's|\([^\.]*\)\.\([^\.]*\)|\1\200|'`;;
[1-9][0-9].[1-9][0-9].[0-9])
int_macosx_version=`echo $macosx_version | sed 's|\([^\.]*\)\.\([^\.]*\)\.\([^\.]*\)|\1\20\3|'`;;
[1-9][0-9].[1-9][0-9].[1-9][0-9])
int_macosx_version=`echo $macosx_version | sed 's|\([^\.]*\)\.\([^\.]*\)\.\([^\.]*\)|\1\2\3|'`;;
*)
int_macosx_version=unexpected;;
esac]
test $int_macosx_version != unexpected || {
AC_MSG_ERROR([Unexpected MacOSX version ($macosx_version) returned by 'sw_vers -productVersion'; this configure script probably needs to be updated])
}
AC_TRY_COMPILE([
#if __ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__ > $int_macosx_version
#error Compiling for a newer MacOSX version...
#endif
], [;],
[],
[AC_MSG_ERROR([

You are natively building Erlang/OTP for a later version of MacOSX
than current version ($macosx_version). You either need to
cross-build Erlang/OTP, or set the environment variable
MACOSX_DEPLOYMENT_TARGET to $macosx_version (or a lower version).

])])
;;
*)
;;
esac
fi

ERL_DED

AC_CONFIG_FILES([../Makefile output.mk ../make/$host/otp_ded.mk:../make/otp_ded.mk.in])
Expand Down