[tor-commits] [tor-browser/tor-browser-38.3.0esr-5.5-1] Bug 16906: Fix MinGW compilation breakage.

[mikeperry at torproject.org]

commit 08a3456fd48830b760a6fa6a0cbee3115f0c22cc
Author: Mike Perry <mikeperry-git at torproject.org>
Date:   Wed Sep 16 23:12:34 2015 -0700

    Bug 16906: Fix MinGW compilation breakage.
    
    Patch from https://hg.mozilla.org/mozilla-central/rev/34bbc3cb3e79
    
    https://bugzilla.mozilla.org/show_bug.cgi?id=1199118
---
 toolkit/mozapps/update/common/certificatecheck.cpp |    3 ---
 toolkit/mozapps/update/common/sources.mozbuild     |    4 ++++
 toolkit/mozapps/update/tests/moz.build             |    1 -
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/toolkit/mozapps/update/common/certificatecheck.cpp b/toolkit/mozapps/update/common/certificatecheck.cpp
index 16a1dd4..f132f2b 100644
--- a/toolkit/mozapps/update/common/certificatecheck.cpp
+++ b/toolkit/mozapps/update/common/certificatecheck.cpp
@@ -11,9 +11,6 @@
 #include "certificatecheck.h"
 #include "updatelogging.h"
 
-#pragma comment(lib, "wintrust.lib")
-#pragma comment(lib, "crypt32.lib")
-
 static const int ENCODING = X509_ASN_ENCODING | PKCS_7_ASN_ENCODING;
 
 /**
diff --git a/toolkit/mozapps/update/common/sources.mozbuild b/toolkit/mozapps/update/common/sources.mozbuild
index 727786f..7ec1aff 100644
--- a/toolkit/mozapps/update/common/sources.mozbuild
+++ b/toolkit/mozapps/update/common/sources.mozbuild
@@ -12,6 +12,10 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'windows':
         'uachelper.cpp',
         'updatehelper.cpp',
     ]
+    OS_LIBS += [
+        'crypt32',
+        'wintrust',
+    ]
 
 sources += [
     'readstrings.cpp',
diff --git a/toolkit/mozapps/update/tests/moz.build b/toolkit/mozapps/update/tests/moz.build
index 9081e5b..65d250c 100644
--- a/toolkit/mozapps/update/tests/moz.build
+++ b/toolkit/mozapps/update/tests/moz.build
@@ -36,7 +36,6 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] != 'android':
 
     if CONFIG['OS_ARCH'] == 'WINNT':
         OS_LIBS += [
-            'wintrust',
             'shlwapi',
         ]