Chromium Code Reviews| Index: build/common.gypi |
| =================================================================== |
| --- build/common.gypi (revision 239766) |
| +++ build/common.gypi (working copy) |
| @@ -366,6 +366,9 @@ |
| # instead of the standard system libraries. |
| 'use_instrumented_libraries%': 0, |
| + # Use libc++ instead of stdlibc++ as standard library for final binary. |
|
Nico
2013/12/10 17:47:30
Please add a warning to this comment that this is
alextaran1
2013/12/13 11:33:10
Anyway, it works without instrumentation too.
|
| + 'use_libcxx%': 0, |
|
Nico
2013/12/10 17:47:30
Call this "use_custom_libcxx" or similar to make c
|
| + |
| # Use a modified version of Clang to intercept allocated types and sizes |
| # for allocated objects. clang_type_profiler=1 implies clang=1. |
| # See http://dev.chromium.org/developers/deep-memory-profiler/cpp-object-type-identifier |
| @@ -930,6 +933,7 @@ |
| 'tsan%': '<(tsan)', |
| 'tsan_blacklist%': '<(tsan_blacklist)', |
| 'use_instrumented_libraries%': '<(use_instrumented_libraries)', |
| + 'use_libcxx%': '<(use_libcxx)', |
| 'clang_type_profiler%': '<(clang_type_profiler)', |
| 'order_profiling%': '<(order_profiling)', |
| 'order_text_section%': '<(order_text_section)', |
| @@ -3515,6 +3519,12 @@ |
| }], |
| ], |
| }], |
| + ['use_libcxx==1', { |
| + 'dependencies': [ |
| + '<(DEPTH)/third_party/libc++/libc++.gyp:libc++', |
| + '<(DEPTH)/third_party/libc++abi/libc++abi.gyp:libc++abi', |
| + ], |
| + }], |
| ['order_profiling!=0 and (chromeos==1 or OS=="linux" or OS=="android")', { |
| 'target_conditions' : [ |
| ['_toolset=="target"', { |