diff options
Diffstat (limited to 'system')
| -rw-r--r-- | system/utils/build/moz.build | 18 |
1 files changed, 7 insertions, 11 deletions
diff --git a/system/utils/build/moz.build b/system/utils/build/moz.build index bbbdcd48a..2cc6cffd3 100644 --- a/system/utils/build/moz.build +++ b/system/utils/build/moz.build @@ -18,7 +18,13 @@ if CONFIG['MOZ_ASAN']: if CONFIG['OS_TARGET'] == 'WINNT': DEFFILE = 'mozglue.def' # We'll break the DLL blocklist if we immediately load user32.dll - DELAYLOAD_DLLS += ['user32.dll'] + # For the same reason, we delayload these other DLLs to avoid eager + # dependencies on user32.dll. + DELAYLOAD_DLLS += [ + 'dbghelp.dll', + 'user32.dll', + 'version.dll', + ] if not CONFIG['JS_STANDALONE']: @@ -59,14 +65,4 @@ LIBRARY_DEFINES['MOZ_HAS_MOZGLUE'] = True LDFLAGS += CONFIG['MOZ_GLUE_WRAP_LDFLAGS'] -if CONFIG['OS_TARGET'] == 'Darwin': - # On OSX 10.10.3, a dead lock happens in some cases involving dynamic - # symbol resolution for symbols that jemalloc itself uses. While it - # might be possible to find a way to avoid all such symbol resolutions, - # it's currently not possible because at the very least there's a call - # to pthread_self from tsd_init_check_recursion, which is necessary - # because somehow clang doesn't want to accept the __thread keyword - # for TLS. - LDFLAGS += ['-Wl,-bind_at_load'] - DIST_INSTALL = True |