From 74b5d87cd94c3a586d5942af67d20af5e83a77eb Mon Sep 17 00:00:00 2001
From: Tom Ritter <tom@mozilla.com>
Date: Thu, 30 Aug 2018 23:17:15 +0300
Subject: [PATCH] Bug 1480457 - Address moz.build failures for mingw-clang
 r=aklotz

--HG--
extra : amend_source : 61f7bfdd7b827d6fd12c16c8ed7cd3c00f5bf09e
---
 mozglue/tests/interceptor/moz.build | 2 +-
 toolkit/library/moz.build           | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/mozglue/tests/interceptor/moz.build b/mozglue/tests/interceptor/moz.build
index a0f205907263..3305a129e1c5 100644
--- a/mozglue/tests/interceptor/moz.build
+++ b/mozglue/tests/interceptor/moz.build
@@ -16,7 +16,7 @@ OS_LIBS += [
     'ole32',
 ]
 
-if CONFIG['OS_TARGET'] == 'WINNT' and CONFIG['CC_TYPE'] == 'gcc':
+if CONFIG['OS_TARGET'] == 'WINNT' and CONFIG['CC_TYPE'] in ('gcc', 'clang'):
     # This allows us to use wmain as the entry point on mingw
     LDFLAGS += [
         '-municode',
diff --git a/toolkit/library/moz.build b/toolkit/library/moz.build
index d505d7d59e18..0d5b444e83c2 100644
--- a/toolkit/library/moz.build
+++ b/toolkit/library/moz.build
@@ -312,6 +312,7 @@ if CONFIG['OS_ARCH'] == 'WINNT':
         'locationapi',
         'sapi',
         'dxguid',
+        'dhcpcsvc',
     ]
     if CONFIG['ACCESSIBILITY']:
         OS_LIBS += [