Chromium Code Reviews| OLD | NEW |
|---|---|
| 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 2960 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 2971 '-gline-tables-only', | 2971 '-gline-tables-only', |
| 2972 ], | 2972 ], |
| 2973 'ldflags': [ | 2973 'ldflags': [ |
| 2974 '-fsanitize=address', | 2974 '-fsanitize=address', |
| 2975 ], | 2975 ], |
| 2976 'defines': [ | 2976 'defines': [ |
| 2977 'ADDRESS_SANITIZER', | 2977 'ADDRESS_SANITIZER', |
| 2978 ], | 2978 ], |
| 2979 }], | 2979 }], |
| 2980 ], | 2980 ], |
| 2981 'conditions': [ | |
| 2982 ['OS=="mac"', { | |
| 2983 'cflags': [ | |
| 2984 '-mllvm -asan-globals=0', # http://crbug.com/196561 | |
|
Nico
2013/04/22 22:20:29
Sorry, I missed this: 'cflags' isn't used on mac.
Alexander Potapenko
2013/04/23 10:09:04
See below, I'm also setting -asan-globals=0 in xco
| |
| 2985 ], | |
| 2986 }], | |
| 2987 ], | |
| 2981 }], | 2988 }], |
| 2982 ['tsan==1', { | 2989 ['tsan==1', { |
| 2983 'target_conditions': [ | 2990 'target_conditions': [ |
| 2984 ['_toolset=="target"', { | 2991 ['_toolset=="target"', { |
| 2985 'cflags': [ | 2992 'cflags': [ |
| 2986 '-fsanitize=thread', | 2993 '-fsanitize=thread', |
| 2987 '-fno-omit-frame-pointer', | 2994 '-fno-omit-frame-pointer', |
| 2988 '-fPIC', | 2995 '-fPIC', |
| 2989 '-mllvm', '-tsan-blacklist=<(tsan_blacklist)', | 2996 '-mllvm', '-tsan-blacklist=<(tsan_blacklist)', |
| 2990 ], | 2997 ], |
| (...skipping 601 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 3592 'conditions': [ | 3599 'conditions': [ |
| 3593 ['clang==1', { | 3600 ['clang==1', { |
| 3594 'variables': { | 3601 'variables': { |
| 3595 'clang_dir': '../third_party/llvm-build/Release+Asserts/bin', | 3602 'clang_dir': '../third_party/llvm-build/Release+Asserts/bin', |
| 3596 }, | 3603 }, |
| 3597 }], | 3604 }], |
| 3598 ['asan==1', { | 3605 ['asan==1', { |
| 3599 'xcode_settings': { | 3606 'xcode_settings': { |
| 3600 'OTHER_CFLAGS': [ | 3607 'OTHER_CFLAGS': [ |
| 3601 '-fsanitize=address', | 3608 '-fsanitize=address', |
| 3609 '-mllvm -asan-globals=0', # http://crbug.com/196561 | |
| 3602 '-w', # http://crbug.com/162783 | 3610 '-w', # http://crbug.com/162783 |
| 3603 ], | 3611 ], |
| 3604 }, | 3612 }, |
| 3605 'defines': [ | 3613 'defines': [ |
| 3606 'ADDRESS_SANITIZER', | 3614 'ADDRESS_SANITIZER', |
| 3607 ], | 3615 ], |
| 3608 }], | 3616 }], |
| 3609 ], | 3617 ], |
| 3610 'target_conditions': [ | 3618 'target_conditions': [ |
| 3611 ['_type!="static_library"', { | 3619 ['_type!="static_library"', { |
| (...skipping 620 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 4232 # settings in target dicts. SYMROOT is a special case, because many other | 4240 # settings in target dicts. SYMROOT is a special case, because many other |
| 4233 # Xcode variables depend on it, including variables such as | 4241 # Xcode variables depend on it, including variables such as |
| 4234 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something | 4242 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something |
| 4235 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the | 4243 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the |
| 4236 # files to appear (when present) in the UI as actual files and not red | 4244 # files to appear (when present) in the UI as actual files and not red |
| 4237 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, | 4245 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, |
| 4238 # and therefore SYMROOT, needs to be set at the project level. | 4246 # and therefore SYMROOT, needs to be set at the project level. |
| 4239 'SYMROOT': '<(DEPTH)/xcodebuild', | 4247 'SYMROOT': '<(DEPTH)/xcodebuild', |
| 4240 }, | 4248 }, |
| 4241 } | 4249 } |
| OLD | NEW |