Add libc++ and libc++abi to third-party.
BUG=318770, 313751 R=glider@chromium.org,thakis@chromium.org,bradnelson@chromium.org,darin@chromium.org Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=240682 Review URL: https://codereview.chromium.org/75213003 git-svn-id: http://src.chromium.org/svn/trunk/src/build@241574 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
This commit is contained in:
Родитель
3e79e966d3
Коммит
4d0811c2c6
12
common.gypi
12
common.gypi
|
@ -370,6 +370,11 @@
|
|||
# instead of the standard system libraries.
|
||||
'use_instrumented_libraries%': 0,
|
||||
|
||||
# Use libc++ (third_party/libc++ and third_party/libc++abi) instead of
|
||||
# stdlibc++ as standard library. This is intended to use for instrumented
|
||||
# builds.
|
||||
'use_custom_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
|
||||
|
@ -935,6 +940,7 @@
|
|||
'tsan%': '<(tsan)',
|
||||
'tsan_blacklist%': '<(tsan_blacklist)',
|
||||
'use_instrumented_libraries%': '<(use_instrumented_libraries)',
|
||||
'use_custom_libcxx%': '<(use_custom_libcxx)',
|
||||
'clang_type_profiler%': '<(clang_type_profiler)',
|
||||
'order_profiling%': '<(order_profiling)',
|
||||
'order_text_section%': '<(order_text_section)',
|
||||
|
@ -3517,6 +3523,12 @@
|
|||
}],
|
||||
],
|
||||
}],
|
||||
['use_custom_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"', {
|
||||
|
|
Загрузка…
Ссылка в новой задаче