Bug 895253 - Disable crash reporter when cross building across different OSes (e.g. OSX android builds). r=ted

This commit is contained in:
Mike Hommey 2013-07-21 13:58:42 +09:00
parent 45178f3acf
commit 62d243d5bb
2 changed files with 11 additions and 6 deletions

View File

@ -11,3 +11,5 @@
# of this file.
mk_add_options AUTOCLOBBER=1
ac_add_options --enable-crashreporter

View File

@ -6128,8 +6128,15 @@ esac
MOZ_ARG_DISABLE_BOOL(crashreporter,
[ --disable-crashreporter Disable breakpad crash reporting],
MOZ_CRASHREPORTER=,
MOZ_CRASHREPORTER=1)
[MOZ_CRASHREPORTER=],
[MOZ_CRASHREPORTER=F # Force enable breakpad])
if test "$OS_ARCH" != "$HOST_OS_ARCH" -a "$OS_ARCH" != "WINNT"; then
if "$MOZ_CRASHREPORTER" = F; then
AC_MSG_ERROR([Cannot --enable-crashreporter, as breakpad tools do not support compiling on $HOST_OS_ARCH while targeting $OS_ARCH.])
fi
MOZ_CRASHREPORTER=
fi
if test -n "$MOZ_CRASHREPORTER"; then
AC_DEFINE(MOZ_CRASHREPORTER)
@ -6141,10 +6148,6 @@ if test -n "$MOZ_CRASHREPORTER"; then
AC_SUBST(MOZ_GTHREAD_LIBS)
fi
if test "$OS_ARCH" != "$HOST_OS_ARCH" -a "$OS_ARCH" != "WINNT"; then
AC_MSG_ERROR([Breakpad tools do not support compiling on $HOST_OS_ARCH while targeting $OS_ARCH. Use --disable-crashreporter.])
fi
if test "$OS_ARCH" = "WINNT"; then
if test -z "$HAVE_64BIT_OS"; then
MOZ_CRASHREPORTER_INJECTOR=1