Rietveld Code Review Tool
Help | Bug tracker | Discussion group | Source code

Delta Between Two Patch Sets: common.gypi

Issue 5163715573841920: Issue 768 - Switch from TR1 to C++11 (Closed)
Left Patch Set: Created July 11, 2014, 2:24 p.m.
Right Patch Set: fix including of <memory> Created Aug. 7, 2015, 6:07 a.m.
Left:
Right:
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
Left: Side by side diff | Download
Right: Side by side diff | Download
« no previous file with change/comment | « README.md ('k') | include/AdblockPlus/DefaultFileSystem.h » ('j') | no next file with change/comment »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
LEFTRIGHT
1 { 1 {
2 'variables': { 2 'variables': {
3 'visibility%': 'hidden', 3 'visibility%': 'hidden',
4 'library%': 'static_library', 4 'library%': 'static_library',
5 'component%': '', 5 'component%': '',
6 'want_separate_host_toolset': 0, 6 'want_separate_host_toolset': 0,
7 'v8_optimized_debug': 0,
8 'v8_enable_i18n_support': 0,
7 }, 9 },
8 10
9 'conditions': [ 11 'conditions': [
10 ['OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="solaris" \ 12 ['OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="solaris" \
11 or OS=="netbsd" or OS=="android"', { 13 or OS=="netbsd" or OS=="android"', {
12 'target_defaults': { 14 'target_defaults': {
13 'cflags': [ '-Wall', '-W', '-Wno-unused-parameter', 15 'cflags': [ '-Wall', '-W', '-Wno-unused-parameter',
14 '-Wnon-virtual-dtor', '-pthread', '-fno-rtti', 16 '-Wnon-virtual-dtor', '-pthread', '-fno-rtti',
15 '-pedantic', '-std=c++0x', '-fexceptions', ], 17 '-pedantic', '-std=c++0x', '-fexceptions', ],
18 'cflags!': [ '-Werror', ],
16 'ldflags': [ '-pthread', ], 19 'ldflags': [ '-pthread', ],
17 }, 20 },
18 }], 21 }],
19 ['OS=="mac"', { 22 ['OS=="mac"', {
20 'xcode_settings': { 23 'xcode_settings': {
21 'CLANG_CXX_LANGUAGE_STANDARD': 'c++11', 24 'CLANG_CXX_LANGUAGE_STANDARD': 'c++11',
22 'CLANG_CXX_LIBRARY': 'libc++', 25 'CLANG_CXX_LIBRARY': 'libc++',
23 'OTHER_CPLUSPLUSFLAGS' : ['-std=c++11', '-stdlib=libc++'], 26 'OTHER_CPLUSPLUSFLAGS' : ['-std=c++11', '-stdlib=libc++'],
24 }, 27 },
25 }], 28 }],
26 ['OS=="android"', { 29 ['OS=="android"', {
27 'target_defaults': { 30 'target_defaults': {
28 'cflags!': [ 31 'cflags!': [
29 '-pthread', # Not supported by Android toolchain. 32 '-pthread', # Not supported by Android toolchain.
30 ], 33 ],
31 'ldflags!': [ 34 'ldflags!': [
32 '-pthread', # Not supported by Android toolchain. 35 '-pthread', # Not supported by Android toolchain.
33 ], 36 ],
34 }, 37 },
35 }], 38 }],
36 ], 39 ],
37 40
38 'target_defaults': { 41 'target_defaults': {
39 'msvs_cygwin_shell': 0, 42 'msvs_cygwin_shell': 0,
40
41 'target_conditions': [[ 43 'target_conditions': [[
42 'OS=="mac" and _type=="executable"', { 44 'OS=="mac" and _type=="executable"', {
43 'xcode_settings': { 45 'xcode_settings': {
44 'OTHER_LDFLAGS': ['-stdlib=libc++'], 46 'OTHER_LDFLAGS': ['-stdlib=libc++'],
45 }, 47 },
46 } 48 }
47 ]], 49 ]],
48 } 50 }
49 } 51 }
LEFTRIGHT

Powered by Google App Engine
This is Rietveld