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

Unified Diff: common.gypi

Issue 5163715573841920: Issue 768 - Switch from TR1 to C++11 (Closed)
Patch Set: Created July 11, 2014, 2:24 p.m.
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: common.gypi
===================================================================
--- a/common.gypi
+++ b/common.gypi
@@ -13,29 +13,37 @@
'cflags': [ '-Wall', '-W', '-Wno-unused-parameter',
'-Wnon-virtual-dtor', '-pthread', '-fno-rtti',
'-pedantic', '-std=c++0x', '-fexceptions', ],
'ldflags': [ '-pthread', ],
},
}],
['OS=="mac"', {
'xcode_settings': {
- 'CLANG_CXX_LANGUAGE_STANDARD': 'c++0x',
- 'CLANG_CXX_LIBRARY': 'libstdc++',
- 'OTHER_CPLUSPLUSFLAGS' : ['-std=c++0x', '-stdlib=libstdc++'],
+ 'CLANG_CXX_LANGUAGE_STANDARD': 'c++11',
+ 'CLANG_CXX_LIBRARY': 'libc++',
+ 'OTHER_CPLUSPLUSFLAGS' : ['-std=c++11', '-stdlib=libc++'],
},
}],
['OS=="android"', {
'target_defaults': {
'cflags!': [
'-pthread', # Not supported by Android toolchain.
],
'ldflags!': [
'-pthread', # Not supported by Android toolchain.
],
},
}],
],
'target_defaults': {
'msvs_cygwin_shell': 0,
+
+ 'target_conditions': [[
+ 'OS=="mac" and _type=="executable"', {
+ 'xcode_settings': {
+ 'OTHER_LDFLAGS': ['-stdlib=libc++'],
+ },
+ }
+ ]],
}
}

Powered by Google App Engine
This is Rietveld