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 2507 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
2518 # removed when we change to that. (This is also why we don't | 2518 # removed when we change to that. (This is also why we don't |
2519 # bother fixing all these cases today.) | 2519 # bother fixing all these cases today.) |
2520 '-Wno-unnamed-type-template-args', | 2520 '-Wno-unnamed-type-template-args', |
2521 # This (rightyfully) complains about 'override', which we use | 2521 # This (rightyfully) complains about 'override', which we use |
2522 # heavily. | 2522 # heavily. |
2523 '-Wno-c++11-extensions', | 2523 '-Wno-c++11-extensions', |
2524 | 2524 |
2525 # Warns on switches on enums that cover all enum values but | 2525 # Warns on switches on enums that cover all enum values but |
2526 # also contain a default: branch. Chrome is full of that. | 2526 # also contain a default: branch. Chrome is full of that. |
2527 '-Wno-covered-switch-default', | 2527 '-Wno-covered-switch-default', |
2528 | |
2529 # TODO(thakis): Remove this once http://crbug.com/151927 is fixed. | |
2530 '-Wno-tautological-constant-out-of-range-compare', | |
2531 ], | 2528 ], |
2532 'cflags!': [ | 2529 'cflags!': [ |
2533 # Clang doesn't seem to know know this flag. | 2530 # Clang doesn't seem to know know this flag. |
2534 '-mfpmath=sse', | 2531 '-mfpmath=sse', |
2535 ], | 2532 ], |
2536 }], | 2533 }], |
2537 ['OS=="android"', { | 2534 ['OS=="android"', { |
2538 'cflags!': [ | 2535 'cflags!': [ |
2539 # Clang ARM does not support the following option. | 2536 # Clang ARM does not support the following option. |
2540 # TODO: Add this flag back http://crbug.com/157195. | 2537 # TODO: Add this flag back http://crbug.com/157195. |
2541 '-Wno-tautological-constant-out-of-range-compare', | 2538 '-Wno-tautological-constant-out-of-range-compare', |
2542 ] | 2539 ] |
2543 }], | 2540 }], |
Nico
2012/11/02 15:28:03
Remove the whole os==android block here too
hans
2012/11/02 15:34:57
Done.
| |
2544 ['clang==1 and clang_use_chrome_plugins==1', { | 2541 ['clang==1 and clang_use_chrome_plugins==1', { |
2545 'cflags': [ | 2542 'cflags': [ |
2546 '<@(clang_chrome_plugins_flags)', | 2543 '<@(clang_chrome_plugins_flags)', |
2547 ], | 2544 ], |
2548 }], | 2545 }], |
2549 ['clang==1 and clang_load!=""', { | 2546 ['clang==1 and clang_load!=""', { |
2550 'cflags': [ | 2547 'cflags': [ |
2551 '-Xclang', '-load', '-Xclang', '<(clang_load)', | 2548 '-Xclang', '-load', '-Xclang', '<(clang_load)', |
2552 ], | 2549 ], |
2553 }], | 2550 }], |
(...skipping 501 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
3055 '-Wno-unnamed-type-template-args', | 3052 '-Wno-unnamed-type-template-args', |
3056 # This (rightyfully) complains about 'override', which we use | 3053 # This (rightyfully) complains about 'override', which we use |
3057 # heavily. | 3054 # heavily. |
3058 '-Wno-c++11-extensions', | 3055 '-Wno-c++11-extensions', |
3059 | 3056 |
3060 # Warns on switches on enums that cover all enum values but | 3057 # Warns on switches on enums that cover all enum values but |
3061 # also contain a default: branch. Chrome is full of that. | 3058 # also contain a default: branch. Chrome is full of that. |
3062 '-Wno-covered-switch-default', | 3059 '-Wno-covered-switch-default', |
3063 | 3060 |
3064 # TODO(thakis): Remove this once http://crbug.com/151927 is fixe d. | 3061 # TODO(thakis): Remove this once http://crbug.com/151927 is fixe d. |
3065 '-Wno-tautological-constant-out-of-range-compare', | 3062 '-Wno-tautological-constant-out-of-range-compare', |
Nico
2012/11/02 15:28:03
Remove it down here too.
hans
2012/11/02 15:34:57
Done.
| |
3066 ], | 3063 ], |
3067 }], | 3064 }], |
3068 ['clang==1 and clang_use_chrome_plugins==1', { | 3065 ['clang==1 and clang_use_chrome_plugins==1', { |
3069 'OTHER_CFLAGS': [ | 3066 'OTHER_CFLAGS': [ |
3070 '<@(clang_chrome_plugins_flags)', | 3067 '<@(clang_chrome_plugins_flags)', |
3071 ], | 3068 ], |
3072 }], | 3069 }], |
3073 ['clang==1 and clang_load!=""', { | 3070 ['clang==1 and clang_load!=""', { |
3074 'OTHER_CFLAGS': [ | 3071 'OTHER_CFLAGS': [ |
3075 '-Xclang', '-load', '-Xclang', '<(clang_load)', | 3072 '-Xclang', '-load', '-Xclang', '<(clang_load)', |
(...skipping 603 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
3679 # settings in target dicts. SYMROOT is a special case, because many other | 3676 # settings in target dicts. SYMROOT is a special case, because many other |
3680 # Xcode variables depend on it, including variables such as | 3677 # Xcode variables depend on it, including variables such as |
3681 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something | 3678 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something |
3682 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the | 3679 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the |
3683 # files to appear (when present) in the UI as actual files and not red | 3680 # files to appear (when present) in the UI as actual files and not red |
3684 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, | 3681 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, |
3685 # and therefore SYMROOT, needs to be set at the project level. | 3682 # and therefore SYMROOT, needs to be set at the project level. |
3686 'SYMROOT': '<(DEPTH)/xcodebuild', | 3683 'SYMROOT': '<(DEPTH)/xcodebuild', |
3687 }, | 3684 }, |
3688 } | 3685 } |
OLD | NEW |