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

Side by Side Diff: build/common.gypi

Issue 330873004: Revert of Include stlport through -isystem instead of -I. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 5 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
« no previous file with comments | « no previous file | build/config/compiler/BUILD.gn » ('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 3797 matching lines...) Expand 10 before | Expand all | Expand 10 after
3808 'cflags!': [ 3808 'cflags!': [
3809 # Clang doesn't seem to know know this flag. 3809 # Clang doesn't seem to know know this flag.
3810 '-mfpmath=sse', 3810 '-mfpmath=sse',
3811 ], 3811 ],
3812 'cflags_cc': [ 3812 'cflags_cc': [
3813 # See the comment in the Mac section for what it takes to move 3813 # See the comment in the Mac section for what it takes to move
3814 # this to -std=c++11. 3814 # this to -std=c++11.
3815 '-std=gnu++11', 3815 '-std=gnu++11',
3816 ], 3816 ],
3817 }], 3817 }],
3818 ['clang==1 and OS=="android"', {
3819 # Android uses stlport, whose include/new defines
3820 # `void operator delete[](void* ptr) throw();`, which
3821 # clang's -Wimplicit-exception-spec-mismatch warns about for some
3822 # reason -- http://llvm.org/PR16638. TODO(thakis): Include stlport
3823 # via -isystem instead.
3824 'cflags_cc': [
3825 '-Wno-implicit-exception-spec-mismatch',
3826 ],
3827 }],
3818 ['clang==1 and clang_use_chrome_plugins==1', { 3828 ['clang==1 and clang_use_chrome_plugins==1', {
3819 'cflags': [ 3829 'cflags': [
3820 '<@(clang_chrome_plugins_flags)', 3830 '<@(clang_chrome_plugins_flags)',
3821 ], 3831 ],
3822 }], 3832 }],
3823 ['clang==1 and clang_load!=""', { 3833 ['clang==1 and clang_load!=""', {
3824 'cflags': [ 3834 'cflags': [
3825 '-Xclang', '-load', '-Xclang', '<(clang_load)', 3835 '-Xclang', '-load', '-Xclang', '<(clang_load)',
3826 ], 3836 ],
3827 }], 3837 }],
(...skipping 584 matching lines...) Expand 10 before | Expand all | Expand 10 after
4412 # toolchain (circa Gingerbread) will exhibit strange errors. 4422 # toolchain (circa Gingerbread) will exhibit strange errors.
4413 # The include ordering here is important; change with caution. 4423 # The include ordering here is important; change with caution.
4414 ['use_system_stlport==1', { 4424 ['use_system_stlport==1', {
4415 'cflags': [ 4425 'cflags': [
4416 # For libstdc++/include, which is used by stlport. 4426 # For libstdc++/include, which is used by stlport.
4417 '-I<(android_src)/bionic', 4427 '-I<(android_src)/bionic',
4418 '-I<(android_src)/external/stlport/stlport', 4428 '-I<(android_src)/external/stlport/stlport',
4419 ], 4429 ],
4420 }, { # else: use_system_stlport!=1 4430 }, { # else: use_system_stlport!=1
4421 'cflags': [ 4431 'cflags': [
4422 '-isystem<(android_stlport_include)', 4432 '-I<(android_stlport_include)',
4423 ], 4433 ],
4424 'ldflags': [ 4434 'ldflags': [
4425 '-L<(android_stlport_libs_dir)', 4435 '-L<(android_stlport_libs_dir)',
4426 ], 4436 ],
4427 }], 4437 }],
4428 ['target_arch=="ia32"', { 4438 ['target_arch=="ia32"', {
4429 # The x86 toolchain currently has problems with stack-protector. 4439 # The x86 toolchain currently has problems with stack-protector.
4430 'cflags!': [ 4440 'cflags!': [
4431 '-fstack-protector', 4441 '-fstack-protector',
4432 ], 4442 ],
(...skipping 1071 matching lines...) Expand 10 before | Expand all | Expand 10 after
5504 # settings in target dicts. SYMROOT is a special case, because many other 5514 # settings in target dicts. SYMROOT is a special case, because many other
5505 # Xcode variables depend on it, including variables such as 5515 # Xcode variables depend on it, including variables such as
5506 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something 5516 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something
5507 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the 5517 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the
5508 # files to appear (when present) in the UI as actual files and not red 5518 # files to appear (when present) in the UI as actual files and not red
5509 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, 5519 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR,
5510 # and therefore SYMROOT, needs to be set at the project level. 5520 # and therefore SYMROOT, needs to be set at the project level.
5511 'SYMROOT': '<(DEPTH)/xcodebuild', 5521 'SYMROOT': '<(DEPTH)/xcodebuild',
5512 }, 5522 },
5513 } 5523 }
OLDNEW
« no previous file with comments | « no previous file | build/config/compiler/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698