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 3584 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
3595 # typeof() is also disabled in c++11 (but we could use | 3595 # typeof() is also disabled in c++11 (but we could use |
3596 # decltype() instead). | 3596 # decltype() instead). |
3597 # TODO(thakis): Use CLANG_CXX_LANGUAGE_STANDARD instead once all | 3597 # TODO(thakis): Use CLANG_CXX_LANGUAGE_STANDARD instead once all |
3598 # bots use xcode 4 -- http://crbug.com/147515). | 3598 # bots use xcode 4 -- http://crbug.com/147515). |
3599 # TODO(thakis): Eventually switch this to c++11 instead of | 3599 # TODO(thakis): Eventually switch this to c++11 instead of |
3600 # gnu++11 (once typeof can be removed, which is blocked on c++11 | 3600 # gnu++11 (once typeof can be removed, which is blocked on c++11 |
3601 # being available everywhere). | 3601 # being available everywhere). |
3602 '$(inherited)', '-std=gnu++11', | 3602 '$(inherited)', '-std=gnu++11', |
3603 ], | 3603 ], |
3604 }], | 3604 }], |
3605 ['clang==1 and clang_use_chrome_plugins==1', { | 3605 # TODO(thakis): Reenable plugins with once |
| 3606 # tools/clang/scripts/update.sh no longer pins clang to an ancient |
| 3607 # version for asan (http://crbug.com/170629) |
| 3608 ['clang==1 and clang_use_chrome_plugins==1 and asan!=1', { |
3606 'OTHER_CFLAGS': [ | 3609 'OTHER_CFLAGS': [ |
3607 '<@(clang_chrome_plugins_flags)', | 3610 '<@(clang_chrome_plugins_flags)', |
3608 ], | 3611 ], |
3609 }], | 3612 }], |
3610 ['clang==1 and clang_load!=""', { | 3613 ['clang==1 and clang_load!=""', { |
3611 'OTHER_CFLAGS': [ | 3614 'OTHER_CFLAGS': [ |
3612 '-Xclang', '-load', '-Xclang', '<(clang_load)', | 3615 '-Xclang', '-load', '-Xclang', '<(clang_load)', |
3613 ], | 3616 ], |
3614 }], | 3617 }], |
3615 ['clang==1 and clang_add_plugin!=""', { | 3618 ['clang==1 and clang_add_plugin!=""', { |
(...skipping 653 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
4269 # settings in target dicts. SYMROOT is a special case, because many other | 4272 # settings in target dicts. SYMROOT is a special case, because many other |
4270 # Xcode variables depend on it, including variables such as | 4273 # Xcode variables depend on it, including variables such as |
4271 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something | 4274 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something |
4272 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the | 4275 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the |
4273 # files to appear (when present) in the UI as actual files and not red | 4276 # files to appear (when present) in the UI as actual files and not red |
4274 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, | 4277 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, |
4275 # and therefore SYMROOT, needs to be set at the project level. | 4278 # and therefore SYMROOT, needs to be set at the project level. |
4276 'SYMROOT': '<(DEPTH)/xcodebuild', | 4279 'SYMROOT': '<(DEPTH)/xcodebuild', |
4277 }, | 4280 }, |
4278 } | 4281 } |
OLD | NEW |