From b83b307dee16e9df3b66402341a339f56fe651dd Mon Sep 17 00:00:00 2001
From: Chris AtLee <catlee@mozilla.com>
Date: Wed, 18 Oct 2017 09:45:00 -0400
Subject: [PATCH] Bug 1409739 - Part 3: Enable DMD in nightly/CI builds
 r=glandium

MozReview-Commit-ID: 12tmFzzvRvP

--HG--
extra : rebase_source : 80077d26b537b75b2478f4c5aaa0e52c0e7db2ba
---
 browser/config/mozconfigs/linux32/nightly  | 1 +
 browser/config/mozconfigs/linux32/valgrind | 1 +
 browser/config/mozconfigs/linux64/nightly  | 1 +
 browser/config/mozconfigs/linux64/valgrind | 1 +
 browser/config/mozconfigs/macosx64/nightly | 1 +
 browser/config/mozconfigs/whitelist        | 1 +
 browser/config/mozconfigs/win32/nightly    | 1 +
 browser/config/mozconfigs/win64/nightly    | 1 +
 8 files changed, 8 insertions(+)

diff --git a/browser/config/mozconfigs/linux32/nightly b/browser/config/mozconfigs/linux32/nightly
index da5c5176cb88..eebd40167a99 100644
--- a/browser/config/mozconfigs/linux32/nightly
+++ b/browser/config/mozconfigs/linux32/nightly
@@ -1,6 +1,7 @@
 . "$topsrcdir/browser/config/mozconfigs/linux32/common-opt"
 
 ac_add_options --enable-verify-mar
+ac_add_options --enable-dmd
 
 ac_add_options --with-branding=browser/branding/nightly
 
diff --git a/browser/config/mozconfigs/linux32/valgrind b/browser/config/mozconfigs/linux32/valgrind
index 773a7ff5b83a..d335038dea1b 100644
--- a/browser/config/mozconfigs/linux32/valgrind
+++ b/browser/config/mozconfigs/linux32/valgrind
@@ -1,6 +1,7 @@
 . $topsrcdir/browser/config/mozconfigs/linux32/nightly
 
 ac_add_options --enable-valgrind
+ac_add_options --disable-dmd
 ac_add_options --disable-jemalloc
 ac_add_options --disable-install-strip
 ac_add_options --disable-gtest-in-build
diff --git a/browser/config/mozconfigs/linux64/nightly b/browser/config/mozconfigs/linux64/nightly
index 839fdeaaff60..a1e623bed7f3 100644
--- a/browser/config/mozconfigs/linux64/nightly
+++ b/browser/config/mozconfigs/linux64/nightly
@@ -1,6 +1,7 @@
 . "$topsrcdir/browser/config/mozconfigs/linux64/common-opt"
 
 ac_add_options --enable-verify-mar
+ac_add_options --enable-dmd
 
 ac_add_options --with-branding=browser/branding/nightly
 
diff --git a/browser/config/mozconfigs/linux64/valgrind b/browser/config/mozconfigs/linux64/valgrind
index 4aa077695efd..1ca6b62095c9 100644
--- a/browser/config/mozconfigs/linux64/valgrind
+++ b/browser/config/mozconfigs/linux64/valgrind
@@ -1,6 +1,7 @@
 . $topsrcdir/browser/config/mozconfigs/linux64/nightly
 
 ac_add_options --enable-valgrind
+ac_add_options --disable-dmd
 ac_add_options --disable-jemalloc
 ac_add_options --disable-install-strip
 ac_add_options --disable-gtest-in-build
diff --git a/browser/config/mozconfigs/macosx64/nightly b/browser/config/mozconfigs/macosx64/nightly
index 4e6d00f27523..0ff34a51cfed 100644
--- a/browser/config/mozconfigs/macosx64/nightly
+++ b/browser/config/mozconfigs/macosx64/nightly
@@ -3,6 +3,7 @@
 ac_add_options --disable-install-strip
 ac_add_options --enable-verify-mar
 ac_add_options --enable-instruments
+ac_add_options --enable-dmd
 
 # Cross-compiled builds fail when dtrace is enabled
 if test `uname -s` != Linux; then
diff --git a/browser/config/mozconfigs/whitelist b/browser/config/mozconfigs/whitelist
index c3cdd082c0dc..8712330c4118 100644
--- a/browser/config/mozconfigs/whitelist
+++ b/browser/config/mozconfigs/whitelist
@@ -9,6 +9,7 @@ all_platforms = ['win64', 'win32', 'linux32', 'linux64', 'macosx64']
 
 for platform in all_platforms:
     whitelist['nightly'][platform] = [
+        'ac_add_options --enable-dmd',
         'ac_add_options --with-branding=browser/branding/nightly',
     ]
 
diff --git a/browser/config/mozconfigs/win32/nightly b/browser/config/mozconfigs/win32/nightly
index 72eba9ed1889..6c03c708378c 100644
--- a/browser/config/mozconfigs/win32/nightly
+++ b/browser/config/mozconfigs/win32/nightly
@@ -2,6 +2,7 @@
 . "$topsrcdir/browser/config/mozconfigs/win32/common-opt"
 
 ac_add_options --enable-verify-mar
+ac_add_options --enable-dmd
 
 ac_add_options --with-branding=browser/branding/nightly
 
diff --git a/browser/config/mozconfigs/win64/nightly b/browser/config/mozconfigs/win64/nightly
index e02fb4b6bf81..8708da714bd6 100644
--- a/browser/config/mozconfigs/win64/nightly
+++ b/browser/config/mozconfigs/win64/nightly
@@ -3,6 +3,7 @@
 . "$topsrcdir/browser/config/mozconfigs/win64/common-opt"
 
 ac_add_options --enable-verify-mar
+ac_add_options --enable-dmd
 
 ac_add_options --with-branding=browser/branding/nightly