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

Side by Side Diff: build/common.gypi

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