Sync to m-c patches in MAR signing tracking bug
authorBrian R. Bondy <netzen@gmail.com>
Tue, 31 Mar 2015 23:24:48 -0400
changeset 491401 090657d1f2d0bf5c11640baa9f195e4f60031f0b
parent 491400 3f1da022de69c193e3fd4448048a7266ef9c5b16
child 491402 c7bad29d12d48b9bb34a390e950b4cecb3930b98
push id47343
push userbmo:dothayer@mozilla.com
push dateWed, 01 Mar 2017 22:58:58 +0000
milestone40.0a1
Sync to m-c patches in MAR signing tracking bug
toolkit/mozapps/update/updater/updater-common.build
--- a/toolkit/mozapps/update/updater/updater-common.build
+++ b/toolkit/mozapps/update/updater/updater-common.build
@@ -42,18 +42,18 @@ if CONFIG['OS_ARCH'] == 'WINNT':
         'ws2_32',
         'shell32',
         'shlwapi',
         'crypt32',
         'advapi32',
     ]
 elif CONFIG['OS_ARCH'] == 'Linux' and CONFIG['MOZ_VERIFY_MAR_SIGNATURE']:
     USE_LIBS += [
+        'nss',
         'signmar',
-        'nss',
         'updatecommon',
     ]
     OS_LIBS += CONFIG['nspr']
 else:
     USE_LIBS += [
         'updatecommon',
     ]
 
@@ -75,17 +75,20 @@ if CONFIG['MOZ_ENABLE_GTK']:
     ]
 
 if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa':
     have_progressui = 1
     srcs += [
         'launchchild_osx.mm',
         'progressui_osx.mm',
     ]
-    OS_LIBS += ['-framework Cocoa -framework Security']
+    OS_LIBS += [
+        '-framework Cocoa',
+        '-framework Security',
+    ]
 elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gonk':
     have_progressui = 1
     srcs += [
         'automounter_gonk.cpp',
         'progressui_gonk.cpp',
     ]
     DISABLE_STL_WRAPPING = True
     OS_LIBS += [