From c0a6c866f50b37fb8c9043c082b5aa898cb9e630 Mon Sep 17 00:00:00 2001
From: Franziskus Kiefer <franziskuskiefer@gmail.com>
Date: Tue, 22 Nov 2016 09:41:18 +0100
Subject: Bug 1319361 - add msan builds, r=ttaubert

Differential Revision: https://nss-review.dev.mozaws.net/D89
---
 coreconf/config.gypi | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

(limited to 'coreconf/config.gypi')

diff --git a/coreconf/config.gypi b/coreconf/config.gypi
index 1a4a9c2c3..fe9b55329 100644
--- a/coreconf/config.gypi
+++ b/coreconf/config.gypi
@@ -93,6 +93,7 @@
     'ssl_enable_zlib%': 1,
     'use_asan%': 0,
     'use_ubsan%': 0,
+    'use_msan%': 0,
     'use_sancov%': 0,
     'test_build%': 0,
     'fuzz%': 0,
@@ -327,6 +328,21 @@
               'LIBRARY_SEARCH_PATHS': ['/usr/lib <(ubsan_flags)'],
             },
           }],
+          [ 'use_msan==1', {
+            'variables': {
+              'msan_flags': '<!(<(python) <(DEPTH)/coreconf/sanitizers.py msan)',
+              'no_ldflags': '<!(<(python) <(DEPTH)/coreconf/sanitizers.py ld)',
+            },
+            'cflags': ['<@(msan_flags)'],
+            'ldflags': ['<@(msan_flags)'],
+            'ldflags!': ['<@(no_ldflags)'],
+            'xcode_settings': {
+              'OTHER_CFLAGS': ['<@(msan_flags)'],
+              'OTHER_LDFLAGS!': ['<@(no_ldflags)'],
+              # See comment above.
+              'LIBRARY_SEARCH_PATHS': ['/usr/lib <(msan_flags)'],
+            },
+          }],
           [ 'use_sancov!=0', {
             'variables': {
               'sancov_flags': '<!(<(python) <(DEPTH)/coreconf/sanitizers.py sancov <(use_sancov))',
-- 
cgit v1.2.1