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

Side by Side Diff: build/common.gypi

Issue 11361133: roll clang 165787:167488 (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: old flag Created 8 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 | Annotate | Revision Log
« no previous file with comments | « no previous file | chrome/browser/ui/cocoa/history_menu_cocoa_controller_unittest.mm » ('j') | no next file with comments »
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 2574 matching lines...) Expand 10 before | Expand all | Expand 10 after
2585 # See http://crbug.com/110262 2585 # See http://crbug.com/110262
2586 '-fcolor-diagnostics', 2586 '-fcolor-diagnostics',
2587 ], 2587 ],
2588 }], 2588 }],
2589 ['asan==1', { 2589 ['asan==1', {
2590 'target_conditions': [ 2590 'target_conditions': [
2591 ['_toolset=="target"', { 2591 ['_toolset=="target"', {
2592 'cflags': [ 2592 'cflags': [
2593 '-faddress-sanitizer', 2593 '-faddress-sanitizer',
2594 '-fno-omit-frame-pointer', 2594 '-fno-omit-frame-pointer',
2595 # See http://crbug.com/159580
2596 '-w',
2595 ], 2597 ],
2596 'ldflags': [ 2598 'ldflags': [
2597 '-faddress-sanitizer', 2599 '-faddress-sanitizer',
2598 ], 2600 ],
2599 'defines': [ 2601 'defines': [
2600 'ADDRESS_SANITIZER', 2602 'ADDRESS_SANITIZER',
2601 ], 2603 ],
2602 }], 2604 }],
2603 ], 2605 ],
2604 }], 2606 }],
2605 ['tsan==1', { 2607 ['tsan==1', {
2606 'target_conditions': [ 2608 'target_conditions': [
2607 ['_toolset=="target"', { 2609 ['_toolset=="target"', {
2608 'cflags': [ 2610 'cflags': [
2609 '-fthread-sanitizer', 2611 '-fthread-sanitizer',
2610 '-fno-omit-frame-pointer', 2612 '-fno-omit-frame-pointer',
2611 '-fPIE', 2613 '-fPIE',
2612 '-mllvm', '-tsan-blacklist=<(tsan_blacklist)' 2614 '-mllvm', '-tsan-blacklist=<(tsan_blacklist)'
2615 # See http://crbug.com/159580
2616 '-w',
2613 ], 2617 ],
2614 'ldflags': [ 2618 'ldflags': [
2615 '-fthread-sanitizer', 2619 '-fthread-sanitizer',
2616 ], 2620 ],
2617 'defines': [ 2621 'defines': [
2618 'THREAD_SANITIZER', 2622 'THREAD_SANITIZER',
2619 'DYNAMIC_ANNOTATIONS_EXTERNAL_IMPL=1', 2623 'DYNAMIC_ANNOTATIONS_EXTERNAL_IMPL=1',
2620 'WTF_USE_DYNAMIC_ANNOTATIONS_NOIMPL=1', 2624 'WTF_USE_DYNAMIC_ANNOTATIONS_NOIMPL=1',
2621 ], 2625 ],
2622 'target_conditions': [ 2626 'target_conditions': [
(...skipping 380 matching lines...) Expand 10 before | Expand all | Expand 10 after
3003 }], 3007 }],
3004 ], 3008 ],
3005 }], 3009 }],
3006 # Settings for building host targets using the system toolchain. 3010 # Settings for building host targets using the system toolchain.
3007 ['_toolset=="host"', { 3011 ['_toolset=="host"', {
3008 'cflags!': [ 3012 'cflags!': [
3009 # Due to issues in Clang build system, using ASan on 32-bit 3013 # Due to issues in Clang build system, using ASan on 32-bit
3010 # binaries on x86_64 host is problematic. 3014 # binaries on x86_64 host is problematic.
3011 # TODO(eugenis): re-enable. 3015 # TODO(eugenis): re-enable.
3012 '-faddress-sanitizer', 3016 '-faddress-sanitizer',
3017 # See http://crbug.com/159580
3018 '-w',
3013 ], 3019 ],
3014 'ldflags!': [ 3020 'ldflags!': [
3015 '-faddress-sanitizer', 3021 '-faddress-sanitizer',
3016 '-Wl,-z,noexecstack', 3022 '-Wl,-z,noexecstack',
3017 '-Wl,--gc-sections', 3023 '-Wl,--gc-sections',
3018 '-Wl,-O1', 3024 '-Wl,-O1',
3019 '-Wl,--as-needed', 3025 '-Wl,--as-needed',
3020 ], 3026 ],
3021 'sources/': [ 3027 'sources/': [
3022 ['exclude', '_android(_unittest)?\\.cc$'], 3028 ['exclude', '_android(_unittest)?\\.cc$'],
(...skipping 99 matching lines...) Expand 10 before | Expand all | Expand 10 after
3122 'conditions': [ 3128 'conditions': [
3123 ['clang==1', { 3129 ['clang==1', {
3124 'variables': { 3130 'variables': {
3125 'clang_dir': '../third_party/llvm-build/Release+Asserts/bin', 3131 'clang_dir': '../third_party/llvm-build/Release+Asserts/bin',
3126 }, 3132 },
3127 }], 3133 }],
3128 ['asan==1', { 3134 ['asan==1', {
3129 'xcode_settings': { 3135 'xcode_settings': {
3130 'OTHER_CFLAGS': [ 3136 'OTHER_CFLAGS': [
3131 '-faddress-sanitizer', 3137 '-faddress-sanitizer',
3138 # See http://crbug.com/159580
3139 '-w',
3132 ], 3140 ],
3133 }, 3141 },
3134 'defines': [ 3142 'defines': [
3135 'ADDRESS_SANITIZER', 3143 'ADDRESS_SANITIZER',
3136 ], 3144 ],
3137 }], 3145 }],
3138 ], 3146 ],
3139 'target_conditions': [ 3147 'target_conditions': [
3140 ['_type!="static_library"', { 3148 ['_type!="static_library"', {
3141 'xcode_settings': {'OTHER_LDFLAGS': ['-Wl,-search_paths_first']}, 3149 'xcode_settings': {'OTHER_LDFLAGS': ['-Wl,-search_paths_first']},
(...skipping 575 matching lines...) Expand 10 before | Expand all | Expand 10 after
3717 # settings in target dicts. SYMROOT is a special case, because many other 3725 # settings in target dicts. SYMROOT is a special case, because many other
3718 # Xcode variables depend on it, including variables such as 3726 # Xcode variables depend on it, including variables such as
3719 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something 3727 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something
3720 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the 3728 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the
3721 # files to appear (when present) in the UI as actual files and not red 3729 # files to appear (when present) in the UI as actual files and not red
3722 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, 3730 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR,
3723 # and therefore SYMROOT, needs to be set at the project level. 3731 # and therefore SYMROOT, needs to be set at the project level.
3724 'SYMROOT': '<(DEPTH)/xcodebuild', 3732 'SYMROOT': '<(DEPTH)/xcodebuild',
3725 }, 3733 },
3726 } 3734 }
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/ui/cocoa/history_menu_cocoa_controller_unittest.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698