| 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 3043 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3054 '-Wno-covered-switch-default', | 3054 '-Wno-covered-switch-default', |
| 3055 | 3055 |
| 3056 # Warns when a const char[] is converted to bool. | 3056 # Warns when a const char[] is converted to bool. |
| 3057 '-Wstring-conversion', | 3057 '-Wstring-conversion', |
| 3058 ], | 3058 ], |
| 3059 'cflags!': [ | 3059 'cflags!': [ |
| 3060 # Clang doesn't seem to know know this flag. | 3060 # Clang doesn't seem to know know this flag. |
| 3061 '-mfpmath=sse', | 3061 '-mfpmath=sse', |
| 3062 ], | 3062 ], |
| 3063 }], | 3063 }], |
| 3064 ['clang==1 and OS!="android"', { | 3064 ['clang==1 and (OS!="android" and chromeos!=1)', { |
| 3065 # Turn on C++11. | 3065 # Turn on C++11. |
| 3066 'cflags': [ | 3066 'cflags': [ |
| 3067 # This warns on using ints as initializers for floats in | 3067 # This warns on using ints as initializers for floats in |
| 3068 # initializer lists (e.g. |int a = f(); CGSize s = { a, a };|), | 3068 # initializer lists (e.g. |int a = f(); CGSize s = { a, a };|), |
| 3069 # which happens in several places in chrome code. Not sure if | 3069 # which happens in several places in chrome code. Not sure if |
| 3070 # this is worth fixing. | 3070 # this is worth fixing. |
| 3071 '-Wno-c++11-narrowing', | 3071 '-Wno-c++11-narrowing', |
| 3072 | 3072 |
| 3073 # This warns about code like |"0x%08"NACL_PRIxPTR| -- with C++11 | 3073 # This warns about code like |"0x%08"NACL_PRIxPTR| -- with C++11 |
| 3074 # user-defined literals, this is now a string literal with a UD | 3074 # user-defined literals, this is now a string literal with a UD |
| 3075 # suffix. However, this is used heavily in NaCl code, so disable | 3075 # suffix. However, this is used heavily in NaCl code, so disable |
| 3076 # the warning for now. | 3076 # the warning for now. |
| 3077 '-Wno-reserved-user-defined-literal', | 3077 '-Wno-reserved-user-defined-literal', |
| 3078 ], | 3078 ], |
| 3079 'cflags_cc': [ | 3079 'cflags_cc': [ |
| 3080 # See the comment in the Mac section for what it takes to move | 3080 # See the comment in the Mac section for what it takes to move |
| 3081 # this to -std=c++11. | 3081 # this to -std=c++11. |
| 3082 '-std=gnu++11', | 3082 '-std=gnu++11', |
| 3083 ], | 3083 ], |
| 3084 }], | 3084 }], |
| 3085 ['clang==1 and OS=="android"', { | 3085 ['clang==1 and (OS=="android" or chromeos==1)', { |
| 3086 # Android uses gcc4.4, and clang isn't compatible with gcc4.4's | 3086 # Android uses gcc4.4, and clang isn't compatible with gcc4.4's |
| 3087 # libstdc++ in C++11 mode. So no C++11 mode for Android yet. | 3087 # libstdc++ in C++11 mode. So no C++11 mode for Android yet. |
| 3088 # Doesn't work with asan for some reason either: crbug.com/233464 | 3088 # Doesn't work with asan for some reason either: crbug.com/233464 |
| 3089 'cflags': [ | 3089 'cflags': [ |
| 3090 # Especially needed for gtest macros using enum values from Mac | 3090 # Especially needed for gtest macros using enum values from Mac |
| 3091 # system headers. | 3091 # system headers. |
| 3092 # TODO(pkasting): In C++11 this is legal, so this should be | 3092 # TODO(pkasting): In C++11 this is legal, so this should be |
| 3093 # removed when we change to that. (This is also why we don't | 3093 # removed when we change to that. (This is also why we don't |
| 3094 # bother fixing all these cases today.) | 3094 # bother fixing all these cases today.) |
| 3095 '-Wno-unnamed-type-template-args', | 3095 '-Wno-unnamed-type-template-args', |
| (...skipping 1362 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 4458 # settings in target dicts. SYMROOT is a special case, because many other | 4458 # settings in target dicts. SYMROOT is a special case, because many other |
| 4459 # Xcode variables depend on it, including variables such as | 4459 # Xcode variables depend on it, including variables such as |
| 4460 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something | 4460 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something |
| 4461 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the | 4461 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the |
| 4462 # files to appear (when present) in the UI as actual files and not red | 4462 # files to appear (when present) in the UI as actual files and not red |
| 4463 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, | 4463 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, |
| 4464 # and therefore SYMROOT, needs to be set at the project level. | 4464 # and therefore SYMROOT, needs to be set at the project level. |
| 4465 'SYMROOT': '<(DEPTH)/xcodebuild', | 4465 'SYMROOT': '<(DEPTH)/xcodebuild', |
| 4466 }, | 4466 }, |
| 4467 } | 4467 } |
| OLD | NEW |