Bug 1188045 - Part 2: Delay-load xul.dll when built with clang-cl
authorEhsan Akhgari <ehsan@mozilla.com>
Mon, 22 Feb 2016 09:55:58 -0500
changeset 285043 3a72236db31ef46050582ebc733c9052c1dfa496
parent 285042 625bfa7b1c88aefa55cae25768d3349e0f8ee26e
child 285044 05c436617515d28ecc42e760a5c3f28fe04f095e
push id72204
push usereakhgari@mozilla.com
push dateMon, 22 Feb 2016 14:57:49 +0000
treeherdermozilla-inbound@3a72236db31e [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs1188045
milestone47.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1188045 - Part 2: Delay-load xul.dll when built with clang-cl This reverts an earlier work-around for this issue.
ipc/app/moz.build
--- a/ipc/app/moz.build
+++ b/ipc/app/moz.build
@@ -61,23 +61,20 @@ if CONFIG['MOZ_SANDBOX'] and CONFIG['OS_
         USE_LIBS += [
             'sandbox_s',
         ]
     else:
         USE_LIBS += [
             'sandbox_staticruntime_s',
         ]
 
-    # clang-cl can't deal with this delay-load due to bug 1188045
-    # (also filed as https://llvm.org/bugs/show_bug.cgi?id=24291)
-    if not CONFIG['CLANG_CL']:
-        DELAYLOAD_DLLS += [
-            'nss3.dll',
-            'xul.dll'
-        ]
+    DELAYLOAD_DLLS += [
+        'nss3.dll',
+        'xul.dll'
+    ]
 
     DEFINES['HASH_NODE_ID_WITH_DEVICE_ID'] = 1;
     SOURCES += [
         'sha256.c',
     ]
 
 if CONFIG['MOZ_SANDBOX'] and CONFIG['OS_TARGET'] in ('Linux', 'Android'):
     USE_LIBS += [