| 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 4060 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 4071 '<!(<(DEPTH)/build/linux/sysroot_ld_path.sh <(sysroot))', | 4071 '<!(<(DEPTH)/build/linux/sysroot_ld_path.sh <(sysroot))', |
| 4072 ], | 4072 ], |
| 4073 }]] | 4073 }]] |
| 4074 }], | 4074 }], |
| 4075 ['clang==1', { | 4075 ['clang==1', { |
| 4076 'cflags': [ | 4076 'cflags': [ |
| 4077 # TODO(thakis): Remove, http://crbug.com/263960 | 4077 # TODO(thakis): Remove, http://crbug.com/263960 |
| 4078 '-Wno-reserved-user-defined-literal', | 4078 '-Wno-reserved-user-defined-literal', |
| 4079 ], | 4079 ], |
| 4080 'cflags_cc': [ | 4080 'cflags_cc': [ |
| 4081 # See the comment in the Mac section for what it takes to move | 4081 # gnu++11 instead of c++11 is needed because some code uses |
| 4082 # this to -std=c++11. | 4082 # typeof() (a GNU extension). |
| 4083 # TODO(thakis): Eventually switch this to c++11 instead, |
| 4084 # http://crbug.com/427584 |
| 4083 '-std=gnu++11', | 4085 '-std=gnu++11', |
| 4084 ], | 4086 ], |
| 4085 }], | 4087 }], |
| 4086 ['clang==0 and host_clang==1', { | 4088 ['clang==0 and host_clang==1', { |
| 4087 'target_conditions': [ | 4089 'target_conditions': [ |
| 4088 ['_toolset=="host"', { | 4090 ['_toolset=="host"', { |
| 4089 'cflags_cc': [ '-std=gnu++11', ], | 4091 'cflags_cc': [ '-std=gnu++11', ], |
| 4090 }], | 4092 }], |
| 4091 ], | 4093 ], |
| 4092 }], | 4094 }], |
| (...skipping 734 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 4827 # pattern. | 4829 # pattern. |
| 4828 '-Wno-missing-field-initializers', | 4830 '-Wno-missing-field-initializers', |
| 4829 ], | 4831 ], |
| 4830 'conditions': [ | 4832 'conditions': [ |
| 4831 ['chromium_mac_pch', {'GCC_PRECOMPILE_PREFIX_HEADER': 'YES'}, | 4833 ['chromium_mac_pch', {'GCC_PRECOMPILE_PREFIX_HEADER': 'YES'}, |
| 4832 {'GCC_PRECOMPILE_PREFIX_HEADER': 'NO'} | 4834 {'GCC_PRECOMPILE_PREFIX_HEADER': 'NO'} |
| 4833 ], | 4835 ], |
| 4834 # Note that the prebuilt Clang binaries should not be used for iOS | 4836 # Note that the prebuilt Clang binaries should not be used for iOS |
| 4835 # development except for ASan builds. | 4837 # development except for ASan builds. |
| 4836 ['clang==1', { | 4838 ['clang==1', { |
| 4837 # gnu++11 instead of c++11 is needed because some code uses | 4839 'CLANG_CXX_LANGUAGE_STANDARD': 'c++11', # -std=c++11 |
| 4838 # typeof() (a GNU extension). | |
| 4839 # TODO(thakis): Eventually switch this to c++11 instead of | |
| 4840 # gnu++11 (once typeof can be removed, which is blocked on c++11 | |
| 4841 # being available everywhere). | |
| 4842 'CLANG_CXX_LANGUAGE_STANDARD': 'gnu++11', # -std=gnu++11 | |
| 4843 # Warn if automatic synthesis is triggered with | 4840 # Warn if automatic synthesis is triggered with |
| 4844 # the -Wobjc-missing-property-synthesis flag. | 4841 # the -Wobjc-missing-property-synthesis flag. |
| 4845 'CLANG_WARN_OBJC_MISSING_PROPERTY_SYNTHESIS': 'YES', | 4842 'CLANG_WARN_OBJC_MISSING_PROPERTY_SYNTHESIS': 'YES', |
| 4846 'GCC_VERSION': 'com.apple.compilers.llvm.clang.1_0', | 4843 'GCC_VERSION': 'com.apple.compilers.llvm.clang.1_0', |
| 4847 'WARNING_CFLAGS': [ | 4844 'WARNING_CFLAGS': [ |
| 4848 # This warns on selectors from Cocoa headers (-length, -set). | 4845 # This warns on selectors from Cocoa headers (-length, -set). |
| 4849 # cfe-dev is currently discussing the merits of this warning. | 4846 # cfe-dev is currently discussing the merits of this warning. |
| 4850 # TODO(thakis): Reevaluate what to do with this, based one | 4847 # TODO(thakis): Reevaluate what to do with this, based one |
| 4851 # cfe-dev discussion. | 4848 # cfe-dev discussion. |
| 4852 '-Wno-selector-type-mismatch', | 4849 '-Wno-selector-type-mismatch', |
| (...skipping 1026 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 5879 # settings in target dicts. SYMROOT is a special case, because many other | 5876 # settings in target dicts. SYMROOT is a special case, because many other |
| 5880 # Xcode variables depend on it, including variables such as | 5877 # Xcode variables depend on it, including variables such as |
| 5881 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something | 5878 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something |
| 5882 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the | 5879 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the |
| 5883 # files to appear (when present) in the UI as actual files and not red | 5880 # files to appear (when present) in the UI as actual files and not red |
| 5884 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, | 5881 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, |
| 5885 # and therefore SYMROOT, needs to be set at the project level. | 5882 # and therefore SYMROOT, needs to be set at the project level. |
| 5886 'SYMROOT': '<(DEPTH)/xcodebuild', | 5883 'SYMROOT': '<(DEPTH)/xcodebuild', |
| 5887 }, | 5884 }, |
| 5888 } | 5885 } |
| OLD | NEW |