commit 1c4b6c01a9a847da77bae2a7fd090d4808b5d9da Author: Tom Ritter tom@mozilla.com Date: Fri May 11 08:16:13 2018 -0500

Bug 1460882 - Disable SANDBOX_EXPORTS for the MinGW Build. r=bobowen, a=jcristau

MozReview-Commit-ID: 2muTxIYUx6F

--HG-- extra : source : 4d7c95672b79599a1192419115e2b25245f7fad1 extra : intermediate-source : 79910289a1f331463d661f484c354eb0d90eb9cf --- security/sandbox/moz.build | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/security/sandbox/moz.build b/security/sandbox/moz.build index 5ecbc3df7297..bdc5e8492a50 100644 --- a/security/sandbox/moz.build +++ b/security/sandbox/moz.build @@ -156,9 +156,11 @@ elif CONFIG['OS_ARCH'] == 'WINNT': 'chromium/sandbox/win/src/service_resolver_32.cc', ]

- for var in ('UNICODE', '_UNICODE', 'NS_NO_XPCOM', 'SANDBOX_EXPORTS', + for var in ('UNICODE', '_UNICODE', 'NS_NO_XPCOM', '_CRT_RAND_S', 'CHROMIUM_SANDBOX_BUILD'): DEFINES[var] = True + if CONFIG['CC_TYPE'] != 'gcc': + DEFINES['SANDBOX_EXPORTS'] = True

LOCAL_INCLUDES += ['/security/sandbox/chromium-shim'] LOCAL_INCLUDES += ['/security/sandbox/chromium']