[tor-commits] [tor-browser/tor-browser-60.4.0esr-8.5-1] squash! TB3: Tor Browser's official .mozconfigs.

[gk at torproject.org]

commit b5793205da5fde6035f1bb7c49752fd38a9ed6e9
Author: Georg Koppen <gk at torproject.org>
Date:   Mon Dec 17 06:48:47 2018 +0000

    squash! TB3: Tor Browser's official .mozconfigs.
    
    Bug 27597: ASan build option in tor-browser-build is broken
---
 .mozconfig-asan | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/.mozconfig-asan b/.mozconfig-asan
index be11dcbd967a..4fde71a0b1e3 100644
--- a/.mozconfig-asan
+++ b/.mozconfig-asan
@@ -1,15 +1,15 @@
 . $topsrcdir/browser/config/mozconfig
 
-export CFLAGS="-fsanitize=address -Dxmalloc=myxmalloc -fwrapv"
-export CXXFLAGS="-fsanitize=address -Dxmalloc=myxmalloc -fwrapv"
+export CFLAGS="-fsanitize=address -Dxmalloc=myxmalloc"
+export CXXFLAGS="-fsanitize=address -Dxmalloc=myxmalloc"
 # We need to add -ldl explicitely due to bug 1213698
 export LDFLAGS="-fsanitize=address -ldl"
 
 # Define HOST_CFLAGS, etc. to avoid compiling programs such as mbsdiff
 # (which is part of mar-tools and is not distributed to end-users) with
 # ASan. See bug 17858.
-export HOST_CFLAGS="-fwrapv"
-export HOST_CXXFLAGS="-fwrapv"
+export HOST_CFLAGS=""
+export HOST_CXXFLAGS=""
 export HOST_LDFLAGS="-ldl"
 
 mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/obj- at CONFIG_GUESS@