[tor-commits] [tor-browser/tor-browser-45.3.0esr-6.5-1] Bug 17858: Cannot create incremental MARs for hardened builds.

[gk at torproject.org]

commit 37e6040d25803771bfe4ef294d90d4e13e4eebb0
Author: Kathy Brade <brade at pearlcrescent.com>
Date:   Fri Aug 12 13:36:03 2016 -0400

    Bug 17858: Cannot create incremental MARs for hardened builds.
    
    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.
---
 .mozconfig-asan | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/.mozconfig-asan b/.mozconfig-asan
index 1a723cf..814362d 100644
--- a/.mozconfig-asan
+++ b/.mozconfig-asan
@@ -5,6 +5,13 @@ export CXXFLAGS="-fsanitize=address -Dxmalloc=myxmalloc -fwrapv"
 # 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_LDFLAGS="-ldl"
+
 mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/obj- at CONFIG_GUESS@
 mk_add_options MOZ_APP_DISPLAYNAME="Tor Browser"
 mk_add_options MOZILLA_OFFICIAL=1