Bug 1639815 - Move --enable-dtrace to python configure. r=froydnj

Differential Revision: https://phabricator.services.mozilla.com/D76289
This commit is contained in:
Mike Hommey 2020-05-21 22:38:47 +00:00
Родитель 114f6b0f27
Коммит 03b3bd5a35
4 изменённых файлов: 9 добавлений и 27 удалений

Просмотреть файл

@ -213,7 +213,6 @@ def old_configure_options(*options):
'--enable-crashreporter',
'--enable-dbus',
'--enable-debug-js-modules',
'--enable-dtrace',
'--enable-dump-painting',
'--enable-extensions',
'--enable-icf',

Просмотреть файл

@ -783,19 +783,6 @@ freebsd*)
;;
esac
MOZ_ARG_ENABLE_BOOL(dtrace,
[ --enable-dtrace build with dtrace support if available (default=no)],
[enable_dtrace="yes"],)
if test "x$enable_dtrace" = "xyes"; then
MOZ_CHECK_HEADER(sys/sdt.h, HAVE_DTRACE=1)
if test -n "$HAVE_DTRACE"; then
AC_DEFINE(INCLUDE_MOZILLA_DTRACE)
else
AC_MSG_ERROR([dtrace enabled but sys/sdt.h not found]);
fi
fi
AC_SUBST(HAVE_DTRACE)
dnl Checks for libraries.
dnl ========================================================
AC_CHECK_LIB(c_r, gethostbyname_r)

Просмотреть файл

@ -636,6 +636,15 @@ llvm_objdump = check_prog('LLVM_OBJDUMP', llvm_objdump, what='llvm-objdump',
add_old_configure_assignment('LLVM_OBJDUMP', llvm_objdump)
js_option('--enable-dtrace', help='Build with dtrace support')
dtrace = check_header('sys/sdt.h', when='--enable-dtrace',
onerror=lambda: die('dtrace enabled but sys/sdt.h not found'))
set_config('HAVE_DTRACE', True, when=dtrace)
set_define('INCLUDE_MOZILLA_DTRACE', True, when=dtrace)
add_old_configure_assignment('enable_dtrace', 'yes', when=dtrace)
# Please do not add configure checks from here on.
# Fallthrough to autoconf-based configure

Просмотреть файл

@ -971,19 +971,6 @@ if test "$ac_cv_sockaddr_sa_len" = true ; then
AC_DEFINE(HAVE_SA_LEN)
fi
MOZ_ARG_ENABLE_BOOL(dtrace,
[ --enable-dtrace build with dtrace support if available (default=no)],
[enable_dtrace="yes"],)
if test "x$enable_dtrace" = "xyes"; then
MOZ_CHECK_HEADER(sys/sdt.h, HAVE_DTRACE=1)
if test -n "$HAVE_DTRACE"; then
AC_DEFINE(INCLUDE_MOZILLA_DTRACE)
else
AC_MSG_ERROR([dtrace enabled but sys/sdt.h not found]);
fi
fi
AC_SUBST(HAVE_DTRACE)
dnl Checks for libraries.
dnl ========================================================
AC_CHECK_LIB(c_r, gethostbyname_r)