bug 1283595 - remove configure checks for rust supporting OS X 10.6. r=glandium

MozReview-Commit-ID: EKUtm5EtYzd

--HG--
extra : rebase_source : ba69d48285e61838c6baf4c20db72796202b14d7
extra : amend_source : 92cd04a0da91fa95d6428dc45c5f82355261baf9
This commit is contained in:
Ted Mielczarek 2016-06-30 15:46:06 -04:00
parent 43467583af
commit a0708eaf80

View File

@ -1012,49 +1012,6 @@ AC_SUBST(HAVE_64BIT_BUILD)
AC_LANG_RESTORE
fi # COMPILE_ENVIRONMENT
dnl ========================================================
dnl Special rust checks
dnl ========================================================
if test -n "$MACOSX_DEPLOYMENT_TARGET" -a -n "$MOZ_RUST"; then
AC_MSG_CHECKING([if we're targeting 32-bit])
if test -z "$HAVE_64BIT_BUILD"; then
AC_MSG_RESULT([using $RUSTC])
else
AC_MSG_RESULT([no])
fi
AC_MSG_CHECKING([rustc compatibility with MacOS X])
# Stock rustc doesn't support MacOS X 10.6 or earlier.
# https://github.com/rust-lang/rust/issues/25342
_MACOSX_TARGET_MINOR=`echo "$MACOSX_DEPLOYMENT_TARGET" | cut -d. -f2`
if test "$_MACOSX_TARGET_MINOR" -lt 7; then
dnl Test C linkage against rust code to see if the rust
dnl toolchain output is compatible.
cat > conftest.rs <<EOF
[#[no_mangle]]
pub extern fn rusty_answer() -> u8 { 42 }
EOF
ac_try="$RUSTC $RUST_TARGET --crate-type staticlib -o conftest.a conftest.rs >/dev/null"
AC_TRY_EVAL(ac_try)
save_LDFLAGS=$LDFLAGS
LDFLAGS="$LDFLAGS conftest.a -lpthread -lm"
AC_TRY_LINK_FUNC([rusty_answer], [
AC_MSG_RESULT([$MACOSX_DEPLOYMENT_TARGET is ok with this rustc])
], [
AC_MSG_RESULT([cannot link for $MACOSX_DEPLOYMENT_TARGET])
MOZ_RUST=
])
LDFLAGS=$save_LDFLAGS
rm -rf conftest*
else
AC_MSG_RESULT([$MACOSX_DEPLOYMENT_TARGET is ok])
fi
if test -z "$MOZ_RUST"; then
AC_MSG_ERROR([rustc does not support MacOS X $MACOSX_DEPLOYMENT_TARGET
Add 'ac_add_options --enable-macos-target=10.7' (or later)
to mozconfig, disable Rust support, or use an alternate toolchain.])
fi
fi
dnl ========================================================
dnl = Use Valgrind