Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(458)

Side by Side Diff: build/common.gypi

Issue 9835085: Revert 128696 - roll clang 151385:153254 due to mac sizes regression (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « no previous file | tools/clang/scripts/update.sh » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 2034 matching lines...) Expand 10 before | Expand all | Expand 10 after
2045 '-Wno-c++11-extensions', 2045 '-Wno-c++11-extensions',
2046 2046
2047 # Warns on switches on enums that cover all enum values but 2047 # Warns on switches on enums that cover all enum values but
2048 # also contain a default: branch. Chrome is full of that. 2048 # also contain a default: branch. Chrome is full of that.
2049 '-Wno-covered-switch-default', 2049 '-Wno-covered-switch-default',
2050 2050
2051 # TODO(thakis): Reenable once this no longer complains about 2051 # TODO(thakis): Reenable once this no longer complains about
2052 # Invalid() in gmocks's gmock-internal-utils.h 2052 # Invalid() in gmocks's gmock-internal-utils.h
2053 # http://crbug.com/111806 2053 # http://crbug.com/111806
2054 '-Wno-null-dereference', 2054 '-Wno-null-dereference',
2055
2056 # TODO(thakis): Investigate if it's worth cleaning up the code
2057 # and turning this on.
2058 '-Wno-null-conversion',
2059 ], 2055 ],
2060 'cflags!': [ 2056 'cflags!': [
2061 # Clang doesn't seem to know know this flag. 2057 # Clang doesn't seem to know know this flag.
2062 '-mfpmath=sse', 2058 '-mfpmath=sse',
2063 ], 2059 ],
2064 }], 2060 }],
2065 ['clang==1 and clang_use_chrome_plugins==1', { 2061 ['clang==1 and clang_use_chrome_plugins==1', {
2066 'cflags': [ 2062 'cflags': [
2067 '<(clang_chrome_plugins_flags)', 2063 '<(clang_chrome_plugins_flags)',
2068 ], 2064 ],
(...skipping 399 matching lines...) Expand 10 before | Expand all | Expand 10 after
2468 '-Wno-c++11-extensions', 2464 '-Wno-c++11-extensions',
2469 2465
2470 # Warns on switches on enums that cover all enum values but 2466 # Warns on switches on enums that cover all enum values but
2471 # also contain a default: branch. Chrome is full of that. 2467 # also contain a default: branch. Chrome is full of that.
2472 '-Wno-covered-switch-default', 2468 '-Wno-covered-switch-default',
2473 2469
2474 # TODO(thakis): Reenable once this no longer complains about 2470 # TODO(thakis): Reenable once this no longer complains about
2475 # Invalid() in gmock's gmock-internal-utils.h 2471 # Invalid() in gmock's gmock-internal-utils.h
2476 # http://crbug.com/111806 2472 # http://crbug.com/111806
2477 '-Wno-null-dereference', 2473 '-Wno-null-dereference',
2478
2479 # TODO(thakis): Investigate if it's worth cleaning up the code
2480 # and turning this on.
2481 '-Wno-null-conversion',
2482 ], 2474 ],
2483 }], 2475 }],
2484 ['clang==1 and clang_use_chrome_plugins==1', { 2476 ['clang==1 and clang_use_chrome_plugins==1', {
2485 'OTHER_CFLAGS': [ 2477 'OTHER_CFLAGS': [
2486 '<(clang_chrome_plugins_flags)', 2478 '<(clang_chrome_plugins_flags)',
2487 ], 2479 ],
2488 }], 2480 }],
2489 ['clang==1 and clang_load!=""', { 2481 ['clang==1 and clang_load!=""', {
2490 'OTHER_CFLAGS': [ 2482 'OTHER_CFLAGS': [
2491 '-Xclang', '-load', '-Xclang', '<(clang_load)', 2483 '-Xclang', '-load', '-Xclang', '<(clang_load)',
(...skipping 459 matching lines...) Expand 10 before | Expand all | Expand 10 after
2951 # settings in target dicts. SYMROOT is a special case, because many other 2943 # settings in target dicts. SYMROOT is a special case, because many other
2952 # Xcode variables depend on it, including variables such as 2944 # Xcode variables depend on it, including variables such as
2953 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something 2945 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something
2954 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the 2946 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the
2955 # files to appear (when present) in the UI as actual files and not red 2947 # files to appear (when present) in the UI as actual files and not red
2956 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, 2948 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR,
2957 # and therefore SYMROOT, needs to be set at the project level. 2949 # and therefore SYMROOT, needs to be set at the project level.
2958 'SYMROOT': '<(DEPTH)/xcodebuild', 2950 'SYMROOT': '<(DEPTH)/xcodebuild',
2959 }, 2951 },
2960 } 2952 }
OLDNEW
« no previous file with comments | « no previous file | tools/clang/scripts/update.sh » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698