| 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 3103 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3114 }], | 3114 }], |
| 3115 ['clang==1', { | 3115 ['clang==1', { |
| 3116 'cflags!': [ | 3116 'cflags!': [ |
| 3117 # Clang does not support the following options. | 3117 # Clang does not support the following options. |
| 3118 '-mthumb-interwork', | 3118 '-mthumb-interwork', |
| 3119 '-finline-limit=64', | 3119 '-finline-limit=64', |
| 3120 '-fno-tree-sra', | 3120 '-fno-tree-sra', |
| 3121 '-fuse-ld=gold', | 3121 '-fuse-ld=gold', |
| 3122 '-Wno-psabi', | 3122 '-Wno-psabi', |
| 3123 ], | 3123 ], |
| 3124 'ldflags!': [ | |
| 3125 # Clang does not support the following options. | |
| 3126 '-fuse-ld=gold', | |
| 3127 ], | |
| 3128 }], | 3124 }], |
| 3129 ], | 3125 ], |
| 3130 }], | 3126 }], |
| 3131 ], | 3127 ], |
| 3132 }], | 3128 }], |
| 3133 ], | 3129 ], |
| 3134 }], | 3130 }], |
| 3135 ['target_arch=="mipsel"', { | 3131 ['target_arch=="mipsel"', { |
| 3136 'target_conditions': [ | 3132 'target_conditions': [ |
| 3137 ['_toolset=="target"', { | 3133 ['_toolset=="target"', { |
| (...skipping 64 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3202 # this is worth fixing. | 3198 # this is worth fixing. |
| 3203 '-Wno-c++11-narrowing', | 3199 '-Wno-c++11-narrowing', |
| 3204 | 3200 |
| 3205 # TODO(thakis): Remove, http://crbug.com/263960 | 3201 # TODO(thakis): Remove, http://crbug.com/263960 |
| 3206 '-Wno-reserved-user-defined-literal', | 3202 '-Wno-reserved-user-defined-literal', |
| 3207 | 3203 |
| 3208 # Clang considers the `register` keyword as deprecated, but e.g. | 3204 # Clang considers the `register` keyword as deprecated, but e.g. |
| 3209 # code generated by flex (used in angle) contains that keyword. | 3205 # code generated by flex (used in angle) contains that keyword. |
| 3210 # http://crbug.com/255186 | 3206 # http://crbug.com/255186 |
| 3211 '-Wno-deprecated-register', | 3207 '-Wno-deprecated-register', |
| 3212 | |
| 3213 # TODO(hans): Remove once we've cleaned up the warnings. | |
| 3214 '-Wno-unused-const-variable', | |
| 3215 | |
| 3216 # This warns about auto_ptr<>, used in third-party code. | |
| 3217 '-Wno-deprecated-declarations', | |
| 3218 ], | 3208 ], |
| 3219 'cflags!': [ | 3209 'cflags!': [ |
| 3220 # Clang doesn't seem to know know this flag. | 3210 # Clang doesn't seem to know know this flag. |
| 3221 '-mfpmath=sse', | 3211 '-mfpmath=sse', |
| 3222 ], | 3212 ], |
| 3223 'cflags_cc': [ | 3213 'cflags_cc': [ |
| 3224 # See the comment in the Mac section for what it takes to move | 3214 # See the comment in the Mac section for what it takes to move |
| 3225 # this to -std=c++11. | 3215 # this to -std=c++11. |
| 3226 '-std=gnu++11', | 3216 '-std=gnu++11', |
| 3227 ], | 3217 ], |
| (...skipping 683 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3911 # also contain a default: branch. Chrome is full of that. | 3901 # also contain a default: branch. Chrome is full of that. |
| 3912 '-Wno-covered-switch-default', | 3902 '-Wno-covered-switch-default', |
| 3913 | 3903 |
| 3914 # Warns when a const char[] is converted to bool. | 3904 # Warns when a const char[] is converted to bool. |
| 3915 '-Wstring-conversion', | 3905 '-Wstring-conversion', |
| 3916 | 3906 |
| 3917 # Clang considers the `register` keyword as deprecated, but e.g. | 3907 # Clang considers the `register` keyword as deprecated, but e.g. |
| 3918 # code generated by flex (used in angle) contains that keyword. | 3908 # code generated by flex (used in angle) contains that keyword. |
| 3919 # http://crbug.com/255186 | 3909 # http://crbug.com/255186 |
| 3920 '-Wno-deprecated-register', | 3910 '-Wno-deprecated-register', |
| 3921 | |
| 3922 # TODO(hans): Remove once we've cleaned up the warnings. | |
| 3923 '-Wno-unused-const-variable', | |
| 3924 | |
| 3925 # This warns about auto_ptr<>, used in third-party code. | |
| 3926 '-Wno-deprecated-declarations', | |
| 3927 ], | 3911 ], |
| 3928 }], | 3912 }], |
| 3929 ['clang==1 and clang_use_chrome_plugins==1', { | 3913 ['clang==1 and clang_use_chrome_plugins==1', { |
| 3930 'OTHER_CFLAGS': [ | 3914 'OTHER_CFLAGS': [ |
| 3931 '<@(clang_chrome_plugins_flags)', | 3915 '<@(clang_chrome_plugins_flags)', |
| 3932 ], | 3916 ], |
| 3933 }], | 3917 }], |
| 3934 ['clang==1 and clang_load!=""', { | 3918 ['clang==1 and clang_load!=""', { |
| 3935 'OTHER_CFLAGS': [ | 3919 'OTHER_CFLAGS': [ |
| 3936 '-Xclang', '-load', '-Xclang', '<(clang_load)', | 3920 '-Xclang', '-load', '-Xclang', '<(clang_load)', |
| (...skipping 807 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 4744 # settings in target dicts. SYMROOT is a special case, because many other | 4728 # settings in target dicts. SYMROOT is a special case, because many other |
| 4745 # Xcode variables depend on it, including variables such as | 4729 # Xcode variables depend on it, including variables such as |
| 4746 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something | 4730 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something |
| 4747 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the | 4731 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the |
| 4748 # files to appear (when present) in the UI as actual files and not red | 4732 # files to appear (when present) in the UI as actual files and not red |
| 4749 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, | 4733 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, |
| 4750 # and therefore SYMROOT, needs to be set at the project level. | 4734 # and therefore SYMROOT, needs to be set at the project level. |
| 4751 'SYMROOT': '<(DEPTH)/xcodebuild', | 4735 'SYMROOT': '<(DEPTH)/xcodebuild', |
| 4752 }, | 4736 }, |
| 4753 } | 4737 } |
| OLD | NEW |