Index: build/common.gypi |
diff --git a/build/common.gypi b/build/common.gypi |
index 211074c4580f2734da6ccac359568289a9dea4d0..445cd64402846deeaaa3a42f76a54d4730fecaea 100644 |
--- a/build/common.gypi |
+++ b/build/common.gypi |
@@ -1099,8 +1099,6 @@ |
# Profile without optimizing out stack frames when profiling==1. |
'profiling_full_stack_frames%': '0', |
- # Enable strict glibc debug mode. |
- 'glibcxx_debug%': 0, |
# And if we want to dump symbols for Breakpad-enabled builds. |
'linux_dump_symbols%': 0, |
# And if we want to strip the binary after dumping symbols. |
@@ -2158,10 +2156,6 @@ |
['profiling==1', { |
'defines': ['ENABLE_PROFILING=1'], |
}], |
- ['OS=="linux" and glibcxx_debug==1', { |
- 'defines': ['_GLIBCXX_DEBUG=1',], |
- 'cflags_cc+': ['-g'], |
- }], |
['remoting==1', { |
'defines': ['ENABLE_REMOTING=1'], |
}], |
@@ -2740,6 +2734,12 @@ |
}], |
], |
}], |
+ ['OS=="linux" and target_arch!="ia32"', { |
+ # Enable libstdc++ debugging facilities to help catch problems |
+ # early, see http://crbug.com/65151 . |
+ # TODO(phajdan.jr): Should we enable this for all of POSIX? |
+ 'defines': ['_GLIBCXX_DEBUG=1',], |
+ }], |
# Disabled on iOS because it was causing a crash on startup. |
# TODO(michelea): investigate, create a reduced test and possibly |
# submit a radar. |