diff --git a/toolkit/crashreporter/google-breakpad/src/tools/linux/dump_syms/moz.build b/toolkit/crashreporter/google-breakpad/src/tools/linux/dump_syms/moz.build
index 4a1d11fbd34c..a36b9b9acfaa 100644
--- a/toolkit/crashreporter/google-breakpad/src/tools/linux/dump_syms/moz.build
+++ b/toolkit/crashreporter/google-breakpad/src/tools/linux/dump_syms/moz.build
@@ -8,7 +8,10 @@ HOST_SOURCES += [
     'dump_syms.cc',
 ]
 
-HostProgram('dump_syms')
+HOST_CXXFLAGS += [
+    '-O2',
+    '-g',
+]
 
 # host_breakpad_linux_common_s needs to come first
 HOST_USE_LIBS += [
@@ -19,6 +22,10 @@ HOST_USE_LIBS += [
     'host_breakpad_dwarf_s',
 ]
 
+# The HostProgram template may append 'host_stdc++compat' to
+# HOST_USE_LIBS, which needs to appear after the entries above.
+HostProgram('dump_syms')
+
 LOCAL_INCLUDES += [
     '../../..',
     '../../../common/linux',
diff --git a/toolkit/crashreporter/google-breakpad/src/tools/mac/dump_syms/moz.build b/toolkit/crashreporter/google-breakpad/src/tools/mac/dump_syms/moz.build
index ddb14e11282d..4cc1a6aa3d10 100644
--- a/toolkit/crashreporter/google-breakpad/src/tools/mac/dump_syms/moz.build
+++ b/toolkit/crashreporter/google-breakpad/src/tools/mac/dump_syms/moz.build
@@ -8,7 +8,10 @@ HOST_SOURCES += [
     'dump_syms_tool.cc',
 ]
 
-HostProgram('dump_syms')
+HOST_CXXFLAGS += [
+    '-O2',
+    '-g',
+]
 
 # Order matters here, but HOST_USE_LIBS must be sorted.
 HOST_USE_LIBS += [
@@ -19,6 +22,10 @@ HOST_USE_LIBS += [
     'host_breakpad_dwarf_s',
 ]
 
+# The HostProgram template may append 'host_stdc++compat' to
+# HOST_USE_LIBS, which needs to appear after the entries above.
+HostProgram('dump_syms')
+
 LOCAL_INCLUDES += [
     '../../..',
     '../../../common/mac',
diff --git a/toolkit/crashreporter/google-breakpad/src/tools/solaris/dump_syms/moz.build b/toolkit/crashreporter/google-breakpad/src/tools/solaris/dump_syms/moz.build
index 203c8d762cd9..96656dba3c39 100644
--- a/toolkit/crashreporter/google-breakpad/src/tools/solaris/dump_syms/moz.build
+++ b/toolkit/crashreporter/google-breakpad/src/tools/solaris/dump_syms/moz.build
@@ -7,14 +7,21 @@
 HOST_SOURCES += [
     'dump_syms.cc',
 ]
-  
-HostProgram('dump_syms')
+
+HOST_CXXFLAGS += [
+    '-O2',
+    '-g',
+]
 
 HOST_USE_LIBS += [
     'host_breakpad_common_s',
     'host_breakpad_solaris_common_s',
 ]
 
+# The HostProgram template may append 'host_stdc++compat' to
+# HOST_USE_LIBS, which needs to appear after the entries above.
+HostProgram('dump_syms')
+
 LOCAL_INCLUDES += [
     '../../..',
     '../../../common/solaris',