Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(599)

Unified Diff: build/common.gypi

Issue 75213003: Add libc++ and libc++abi to third-party. (Closed) Base URL: https://src.chromium.org/chrome/trunk/src/
Patch Set: Created 7 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | third_party/libcxx/.arcconfig » ('j') | third_party/libcxx/.arcconfig » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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"', {
« no previous file with comments | « no previous file | third_party/libcxx/.arcconfig » ('j') | third_party/libcxx/.arcconfig » ('J')

Powered by Google App Engine
This is Rietveld 408576698