Skip to content

Commit d827997

Browse files
authored
Merge pull request #2871 from bjorng/bjorn/remove-macos-version-check
macOS: Remove version check in configure script
2 parents 9958cd1 + f1044ef commit d827997

1 file changed

Lines changed: 0 additions & 44 deletions

File tree

make/configure.in

Lines changed: 0 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -387,50 +387,6 @@ if test X${enable_native_libs} = Xyes -a X${enable_hipe} != Xno; then
387387
fi
388388
AC_SUBST(NATIVE_LIBS_ENABLED)
389389

390-
if test $CROSS_COMPILING = no; then
391-
case $host_os in
392-
darwin*)
393-
macosx_version=`sw_vers -productVersion`
394-
test $? -eq 0 || {
395-
AC_MSG_ERROR([Failed to execute 'sw_vers'; please provide it in PATH])
396-
}
397-
[case "$macosx_version" in
398-
[1-9][0-9].[0-9])
399-
int_macosx_version=`echo $macosx_version | sed 's|\([^\.]*\)\.\([^\.]*\)|\10\200|'`;;
400-
[1-9][0-9].[0-9].[0-9])
401-
int_macosx_version=`echo $macosx_version | sed 's|\([^\.]*\)\.\([^\.]*\)\.\([^\.]*\)|\10\20\3|'`;;
402-
[1-9][0-9].[1-9][0-9])
403-
int_macosx_version=`echo $macosx_version | sed 's|\([^\.]*\)\.\([^\.]*\)|\1\200|'`;;
404-
[1-9][0-9].[1-9][0-9].[0-9])
405-
int_macosx_version=`echo $macosx_version | sed 's|\([^\.]*\)\.\([^\.]*\)\.\([^\.]*\)|\1\20\3|'`;;
406-
[1-9][0-9].[1-9][0-9].[1-9][0-9])
407-
int_macosx_version=`echo $macosx_version | sed 's|\([^\.]*\)\.\([^\.]*\)\.\([^\.]*\)|\1\2\3|'`;;
408-
*)
409-
int_macosx_version=unexpected;;
410-
esac]
411-
test $int_macosx_version != unexpected || {
412-
AC_MSG_ERROR([Unexpected MacOSX version ($macosx_version) returned by 'sw_vers -productVersion'; this configure script probably needs to be updated])
413-
}
414-
AC_TRY_COMPILE([
415-
#if __ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__ > $int_macosx_version
416-
#error Compiling for a newer MacOSX version...
417-
#endif
418-
], [;],
419-
[],
420-
[AC_MSG_ERROR([
421-
422-
You are natively building Erlang/OTP for a later version of MacOSX
423-
than current version ($macosx_version). You either need to
424-
cross-build Erlang/OTP, or set the environment variable
425-
MACOSX_DEPLOYMENT_TARGET to $macosx_version (or a lower version).
426-
427-
])])
428-
;;
429-
*)
430-
;;
431-
esac
432-
fi
433-
434390
ERL_DED
435391

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

0 commit comments

Comments
 (0)