Bug 1257434 - Move MOZ_ENABLE_PROFILER_SPS to moz.configure. r=ted

This commit is contained in:
Mike Hommey 2016-03-17 16:08:53 +09:00
Родитель 58397bd671
Коммит baacddb8dc
2 изменённых файлов: 15 добавлений и 36 удалений

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

@ -1216,41 +1216,6 @@ if test -n "$MOZ_JPROF"; then
MOZ_PROFILING=1
fi
dnl ========================================================
dnl SPS Profiler
dnl ========================================================
MOZ_ENABLE_PROFILER_SPS=1
case "${OS_TARGET}" in
Android)
case "${CPU_ARCH}" in
x86 | arm) ;;
*)
MOZ_ENABLE_PROFILER_SPS=
esac
;;
Linux)
case "${CPU_ARCH}" in
x86 | x86_64) ;;
*)
MOZ_ENABLE_PROFILER_SPS=
esac
;;
WINNT) ;;
Darwin)
if test -n "$MOZ_IOS"; then
MOZ_ENABLE_PROFILER_SPS=
fi
;;
*)
MOZ_ENABLE_PROFILER_SPS=
;;
esac
if test -n "$MOZ_ENABLE_PROFILER_SPS"; then
AC_DEFINE(MOZ_ENABLE_PROFILER_SPS)
fi
dnl ========================================================
dnl instruments
dnl ========================================================
@ -7431,7 +7396,6 @@ AC_SUBST(MOZ_DEBUG_SYMBOLS)
AC_SUBST(MOZ_DEBUG_LDFLAGS)
AC_SUBST(WARNINGS_AS_ERRORS)
AC_SUBST_SET(MOZ_EXTENSIONS)
AC_SUBST(MOZ_ENABLE_PROFILER_SPS)
AC_SUBST(MOZ_INSTRUMENTS)
AC_SUBST(MOZ_CALLGRIND)
AC_SUBST(MOZ_VTUNE)

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

@ -32,6 +32,21 @@ def jprof(value):
add_old_configure_assignment('MOZ_JPROF', '1')
@depends(target)
def sps_profiler(target):
if target.os == 'Android':
return target.cpu in ('arm', 'x86')
elif target.kernel == 'Linux':
return target.cpu in ('x86', 'x86_64')
return target.os in ('OSX', 'WINNT')
@depends(sps_profiler)
def sps_profiler_define(value):
if value:
set_config('MOZ_ENABLE_PROFILER_SPS', '1')
set_define('MOZ_ENABLE_PROFILER_SPS', '1')
# Javascript engine
# ==============================================================
include('../js/moz.configure')