Chromium Code Reviews| Index: build/common.gypi |
| =================================================================== |
| --- build/common.gypi (revision 235728) |
| +++ build/common.gypi (working copy) |
| @@ -340,6 +340,9 @@ |
| # instead of the standard system libraries. |
| 'use_instrumented_libraries%': 0, |
| + # Use libc++ instead of stdlibc++ as standard library for final binary. |
| + 'libcxx': 0, |
| + |
| # 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 |
| @@ -897,6 +900,7 @@ |
| 'tsan%': '<(tsan)', |
| 'tsan_blacklist%': '<(tsan_blacklist)', |
| 'use_instrumented_libraries%': '<(use_instrumented_libraries)', |
| + 'libcxx%': '<(libcxx)', |
|
Alexander Potapenko
2013/11/19 15:28:08
I suggest "use_libcxx" instead, this is a common p
|
| 'clang_type_profiler%': '<(clang_type_profiler)', |
| 'order_profiling%': '<(order_profiling)', |
| 'order_text_section%': '<(order_text_section)', |
| @@ -3431,6 +3435,12 @@ |
| }], |
| ], |
| }], |
| + ['libcxx==1', { |
| + 'dependencies': [ |
| + '<(DEPTH)/third_party/libcxx/libcxx.gyp:libcxx', |
| + '<(DEPTH)/third_party/libcxxabi/libcxxabi.gyp:libcxxabi', |
|
bradn
2013/11/22 17:49:17
Rather then inject the dependency into everything,
|
| + ], |
| + }], |
| ['order_profiling!=0 and (chromeos==1 or OS=="linux" or OS=="android")', { |
| 'target_conditions' : [ |
| ['_toolset=="target"', { |