mozilla-central: changeset 253490:8e1b61112fbb126d25ca739fa99217230267fb50

author	Jed Davis <jld@mozilla.com>
	Thu, 16 Jul 2015 11:53:00 -0400
changeset 253490	8e1b61112fbb126d25ca739fa99217230267fb50
parent 253489	571b4e0fdf538616f9800bcf72bd992ed16679f6
child 253491	1ece1edb6956bd13c4f62ca2ccefce518e1c245d
push id	29067
push user	kwierso@gmail.com
push date	Sat, 18 Jul 2015 00:57:04 +0000
treeherder	mozilla-central@e2f2eb9ecca0 [default view] [failures only]
perfherder	[talos] [build metrics] [platform microbench] (compared to previous push)
reviewers	kang
bugs	1182565
milestone	42.0a1
first release with	nightly linux32 d317a93e5161 / 42.0a1 / 20150718030211 / files nightly linux64 d317a93e5161 / 42.0a1 / 20150718030211 / files nightly mac d317a93e5161 / 42.0a1 / 20150718030211 / files nightly win32 d317a93e5161 / 42.0a1 / 20150718030211 / files nightly win64 d317a93e5161 / 42.0a1 / 20150718030211 / files
last release without	nightly linux32 15155971639c / 42.0a1 / 20150717030202 / files nightly linux64 15155971639c / 42.0a1 / 20150717030202 / files nightly mac 15155971639c / 42.0a1 / 20150717030202 / files nightly win32 15155971639c / 42.0a1 / 20150717030202 / files nightly win64 15155971639c / 42.0a1 / 20150717030202 / files

--- a/configure.in
+++ b/configure.in
@@ -6664,16 +6664,25 @@ dnl ====================================
 if test -n "$MOZ_NO_EV_CERTS"; then
     AC_DEFINE(MOZ_NO_EV_CERTS)
 fi
 AC_SUBST(MOZ_NO_EV_CERTS)
 
 dnl ========================================================
 dnl = Sandboxing support
 dnl ========================================================
+if test -n "$MOZ_TSAN"; then
+    # Bug 1182565: TSan conflicts with sandboxing on Linux.
+    case $OS_TARGET in
+    Linux|Android)
+        MOZ_SANDBOX=
+        ;;
+    esac
+fi
+
 MOZ_ARG_DISABLE_BOOL(sandbox,
 [  --disable-sandbox        Disable sandboxing support],
     MOZ_SANDBOX=,
     MOZ_SANDBOX=1)
 
 dnl ========================================================
 dnl = Content process sandboxing
 dnl ========================================================