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

Side by Side 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 unified diff | Download patch
« no previous file with comments | « no previous file | third_party/libcxx/.arcconfig » ('j') | third_party/libcxx/.arcconfig » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 # Use of this source code is governed by a BSD-style license that can be 2 # Use of this source code is governed by a BSD-style license that can be
3 # found in the LICENSE file. 3 # found in the LICENSE file.
4 4
5 # IMPORTANT: 5 # IMPORTANT:
6 # Please don't directly include this file if you are building via gyp_chromium, 6 # Please don't directly include this file if you are building via gyp_chromium,
7 # since gyp_chromium is automatically forcing its inclusion. 7 # since gyp_chromium is automatically forcing its inclusion.
8 { 8 {
9 # Variables expected to be overriden on the GYP command line (-D) or by 9 # Variables expected to be overriden on the GYP command line (-D) or by
10 # ~/.gyp/include.gypi. 10 # ~/.gyp/include.gypi.
(...skipping 322 matching lines...) Expand 10 before | Expand all | Expand 10 after
333 333
334 # Enable building with MSAN (Clang's -fsanitize=memory option). 334 # Enable building with MSAN (Clang's -fsanitize=memory option).
335 # MemorySanitizer only works with clang, but msan=1 implies clang=1 335 # MemorySanitizer only works with clang, but msan=1 implies clang=1
336 # See http://clang.llvm.org/docs/MemorySanitizer.html 336 # See http://clang.llvm.org/docs/MemorySanitizer.html
337 'msan%': 0, 337 'msan%': 0,
338 338
339 # Use the dynamic libraries instrumented by one of the sanitizers 339 # Use the dynamic libraries instrumented by one of the sanitizers
340 # instead of the standard system libraries. 340 # instead of the standard system libraries.
341 'use_instrumented_libraries%': 0, 341 'use_instrumented_libraries%': 0,
342 342
343 # Use libc++ instead of stdlibc++ as standard library for final binary.
344 'libcxx': 0,
345
343 # Use a modified version of Clang to intercept allocated types and sizes 346 # Use a modified version of Clang to intercept allocated types and sizes
344 # for allocated objects. clang_type_profiler=1 implies clang=1. 347 # for allocated objects. clang_type_profiler=1 implies clang=1.
345 # See http://dev.chromium.org/developers/deep-memory-profiler/cpp-object-t ype-identifier 348 # See http://dev.chromium.org/developers/deep-memory-profiler/cpp-object-t ype-identifier
346 # TODO(dmikurube): Support mac. See http://crbug.com/123758#c11 349 # TODO(dmikurube): Support mac. See http://crbug.com/123758#c11
347 'clang_type_profiler%': 0, 350 'clang_type_profiler%': 0,
348 351
349 # Set to true to instrument the code with function call logger. 352 # Set to true to instrument the code with function call logger.
350 # See src/third_party/cygprofile/cyg-profile.cc for details. 353 # See src/third_party/cygprofile/cyg-profile.cc for details.
351 'order_profiling%': 0, 354 'order_profiling%': 0,
352 355
(...skipping 537 matching lines...) Expand 10 before | Expand all | Expand 10 after
890 'input_speech%': '<(input_speech)', 893 'input_speech%': '<(input_speech)',
891 'notifications%': '<(notifications)', 894 'notifications%': '<(notifications)',
892 'clang_use_chrome_plugins%': '<(clang_use_chrome_plugins)', 895 'clang_use_chrome_plugins%': '<(clang_use_chrome_plugins)',
893 'mac_want_real_dsym%': '<(mac_want_real_dsym)', 896 'mac_want_real_dsym%': '<(mac_want_real_dsym)',
894 'asan%': '<(asan)', 897 'asan%': '<(asan)',
895 'lsan%': '<(lsan)', 898 'lsan%': '<(lsan)',
896 'msan%': '<(msan)', 899 'msan%': '<(msan)',
897 'tsan%': '<(tsan)', 900 'tsan%': '<(tsan)',
898 'tsan_blacklist%': '<(tsan_blacklist)', 901 'tsan_blacklist%': '<(tsan_blacklist)',
899 'use_instrumented_libraries%': '<(use_instrumented_libraries)', 902 'use_instrumented_libraries%': '<(use_instrumented_libraries)',
903 'libcxx%': '<(libcxx)',
Alexander Potapenko 2013/11/19 15:28:08 I suggest "use_libcxx" instead, this is a common p
900 'clang_type_profiler%': '<(clang_type_profiler)', 904 'clang_type_profiler%': '<(clang_type_profiler)',
901 'order_profiling%': '<(order_profiling)', 905 'order_profiling%': '<(order_profiling)',
902 'order_text_section%': '<(order_text_section)', 906 'order_text_section%': '<(order_text_section)',
903 'enable_extensions%': '<(enable_extensions)', 907 'enable_extensions%': '<(enable_extensions)',
904 'enable_plugin_installation%': '<(enable_plugin_installation)', 908 'enable_plugin_installation%': '<(enable_plugin_installation)',
905 'enable_plugins%': '<(enable_plugins)', 909 'enable_plugins%': '<(enable_plugins)',
906 'enable_session_service%': '<(enable_session_service)', 910 'enable_session_service%': '<(enable_session_service)',
907 'enable_themes%': '<(enable_themes)', 911 'enable_themes%': '<(enable_themes)',
908 'enable_autofill_dialog%': '<(enable_autofill_dialog)', 912 'enable_autofill_dialog%': '<(enable_autofill_dialog)',
909 'enable_background%': '<(enable_background)', 913 'enable_background%': '<(enable_background)',
(...skipping 2514 matching lines...) Expand 10 before | Expand all | Expand 10 after
3424 'ldflags': [ 3428 'ldflags': [
3425 # Add RPATH to result binary to make it linking instrument ed libraries ($ORIGIN means relative RPATH) 3429 # Add RPATH to result binary to make it linking instrument ed libraries ($ORIGIN means relative RPATH)
3426 '-Wl,-R,\$$ORIGIN/instrumented_libraries/asan/lib/:\$$ORIG IN/instrumented_libraries/asan/usr/lib/x86_64-linux-gnu/', 3430 '-Wl,-R,\$$ORIGIN/instrumented_libraries/asan/lib/:\$$ORIG IN/instrumented_libraries/asan/usr/lib/x86_64-linux-gnu/',
3427 '-Wl,-z,origin', 3431 '-Wl,-z,origin',
3428 ], 3432 ],
3429 }], 3433 }],
3430 ], 3434 ],
3431 }], 3435 }],
3432 ], 3436 ],
3433 }], 3437 }],
3438 ['libcxx==1', {
3439 'dependencies': [
3440 '<(DEPTH)/third_party/libcxx/libcxx.gyp:libcxx',
3441 '<(DEPTH)/third_party/libcxxabi/libcxxabi.gyp:libcxxabi',
bradn 2013/11/22 17:49:17 Rather then inject the dependency into everything,
3442 ],
3443 }],
3434 ['order_profiling!=0 and (chromeos==1 or OS=="linux" or OS=="android") ', { 3444 ['order_profiling!=0 and (chromeos==1 or OS=="linux" or OS=="android") ', {
3435 'target_conditions' : [ 3445 'target_conditions' : [
3436 ['_toolset=="target"', { 3446 ['_toolset=="target"', {
3437 'cflags': [ 3447 'cflags': [
3438 '-finstrument-functions', 3448 '-finstrument-functions',
3439 # Allow mmx intrinsics to inline, so that the 3449 # Allow mmx intrinsics to inline, so that the
3440 #0 compiler can expand the intrinsics. 3450 #0 compiler can expand the intrinsics.
3441 '-finstrument-functions-exclude-file-list=mmintrin.h', 3451 '-finstrument-functions-exclude-file-list=mmintrin.h',
3442 ], 3452 ],
3443 }], 3453 }],
(...skipping 1278 matching lines...) Expand 10 before | Expand all | Expand 10 after
4722 # settings in target dicts. SYMROOT is a special case, because many other 4732 # settings in target dicts. SYMROOT is a special case, because many other
4723 # Xcode variables depend on it, including variables such as 4733 # Xcode variables depend on it, including variables such as
4724 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something 4734 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something
4725 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the 4735 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the
4726 # files to appear (when present) in the UI as actual files and not red 4736 # files to appear (when present) in the UI as actual files and not red
4727 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, 4737 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR,
4728 # and therefore SYMROOT, needs to be set at the project level. 4738 # and therefore SYMROOT, needs to be set at the project level.
4729 'SYMROOT': '<(DEPTH)/xcodebuild', 4739 'SYMROOT': '<(DEPTH)/xcodebuild',
4730 }, 4740 },
4731 } 4741 }
OLDNEW
« 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