Bug 1571505 - Properly add dbghelp where needed. r=nalexander
authorMike Hommey <mh+mozilla@glandium.org>
Tue, 06 Aug 2019 18:14:12 +0000
changeset 486635 28eda64f9a939584bd98066bb60eb76460eac216
parent 486634 b9d11179074b107c76253bd8cf9e72a403294099
child 486636 628c58d53615330310cc1c5da53637536ead1f7c
push id91846
push usermh@glandium.org
push dateTue, 06 Aug 2019 23:07:59 +0000
treeherderautoland@28eda64f9a93 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersnalexander
bugs1571505
milestone70.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 1571505 - Properly add dbghelp where needed. r=nalexander While here, properly export StackWalk.h when building with --enable-project=memory. Differential Revision: https://phabricator.services.mozilla.com/D40731
memory/replace/dmd/moz.build
memory/replace/logalloc/replay/moz.build
memory/replace/phc/moz.build
--- a/memory/replace/dmd/moz.build
+++ b/memory/replace/dmd/moz.build
@@ -14,25 +14,24 @@ UNIFIED_SOURCES += [
 
 if not CONFIG['MOZ_REPLACE_MALLOC_STATIC']:
     UNIFIED_SOURCES += [
         '/mfbt/HashFunctions.cpp',
         '/mfbt/JSONWriter.cpp',
         '/mfbt/Poison.cpp',
         '/mozglue/misc/StackWalk.cpp',
     ]
+    if CONFIG['OS_ARCH'] == 'WINNT':
+        OS_LIBS += [
+            'dbghelp',
+        ]
 
 ReplaceMalloc('dmd')
 
 DEFINES['MOZ_NO_MOZALLOC'] = True
 DEFINES['IMPL_MFBT'] = True
 
 if CONFIG['MOZ_OPTIMIZE']:
     DEFINES['MOZ_OPTIMIZE'] = True
 
 DisableStlWrapping()
 
-if CONFIG['OS_ARCH'] == 'WINNT':
-    OS_LIBS += [
-        'dbghelp',
-    ]
-
 TEST_DIRS += ['test']
--- a/memory/replace/logalloc/replay/moz.build
+++ b/memory/replace/logalloc/replay/moz.build
@@ -17,16 +17,22 @@ SOURCES += [
 
 if CONFIG['MOZ_REPLACE_MALLOC_STATIC'] and \
    (CONFIG['MOZ_DMD'] or CONFIG['MOZ_PHC']):
     UNIFIED_SOURCES += [
         '/mfbt/HashFunctions.cpp',
         '/mfbt/JSONWriter.cpp',
         '/mozglue/misc/StackWalk.cpp',
     ]
+    if CONFIG['OS_ARCH'] == 'WINNT':
+        OS_LIBS += [
+            'dbghelp',
+        ]
+
+if CONFIG['MOZ_DMD'] or CONFIG['MOZ_PHC']:
     if CONFIG['MOZ_BUILD_APP'] == 'memory':
         EXPORTS.mozilla += [
             '/mozglue/misc/StackWalk.h',
         ]
 
 if not CONFIG['MOZ_REPLACE_MALLOC_STATIC']:
     SOURCES += [
         '../FdPrintf.cpp',
--- a/memory/replace/phc/moz.build
+++ b/memory/replace/phc/moz.build
@@ -21,12 +21,16 @@ UNIFIED_SOURCES += [
     'PHC.cpp',
 ]
 
 if not CONFIG['MOZ_REPLACE_MALLOC_STATIC']:
     SOURCES += [
         '../logalloc/FdPrintf.cpp',
         '/mozglue/misc/StackWalk.cpp',
     ]
+    if CONFIG['OS_ARCH'] == 'WINNT':
+        OS_LIBS += [
+            'dbghelp',
+        ]
 
 TEST_DIRS += ['test']
 
 DisableStlWrapping()