Bug 1188045: Don't delayload xul.dll or nss3.dll on clang-cl builds. r=glandium
authorDavid Major <dmajor@mozilla.com>
Tue, 08 Sep 2015 15:07:45 -0400
changeset 261585 71d29e7967e5df599785de017a5f098f752845f8
parent 261584 a18a6dca709bc2cdd67227af4c1e099712c21d6d
child 261586 46f3675eec80eee3b85da28ec4996900e601849c
push id15105
push userkwierso@gmail.com
push dateWed, 09 Sep 2015 20:53:22 +0000
treeherderfx-team@dd2a1d737a64 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersglandium
bugs1188045
milestone43.0a1
Bug 1188045: Don't delayload xul.dll or nss3.dll on clang-cl builds. r=glandium
ipc/app/moz.build
--- a/ipc/app/moz.build
+++ b/ipc/app/moz.build
@@ -52,20 +52,25 @@ if CONFIG['MOZ_SANDBOX'] and CONFIG['OS_
     LOCAL_INCLUDES += [
         '/security/sandbox/chromium',
         '/security/sandbox/chromium-shim',
     ]
     USE_LIBS += [
         'rlz',
         'sandbox_staticruntime_s',
     ]
-    DELAYLOAD_DLLS += [
-        'nss3.dll',
-        'xul.dll'
-    ]
+
+    # 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'
+        ]
+
     DEFINES['HASH_NODE_ID_WITH_DEVICE_ID'] = 1;
     SOURCES += [
         'sha256.c',
     ]
 
 if CONFIG['MOZ_SANDBOX'] and CONFIG['OS_TARGET'] in ('Linux', 'Android'):
     USE_LIBS += [
         'mozsandbox',