From 5d45ccf9707046318fdfb37158d60ed070360c1c Mon Sep 17 00:00:00 2001 From: Paul Davis Date: Fri, 22 May 2015 18:33:01 -0400 Subject: [PATCH] Revert "experimentally remove some C++11 flags (likely to return)" This reverts commit a27ad61695053fc18a9630dd9e7c2418416ba915. This was not a fix for the problem it was an attempt to fix. --- wscript | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/wscript b/wscript index e1a96cddaf..c9c0e41210 100644 --- a/wscript +++ b/wscript @@ -375,14 +375,14 @@ int main() { return 0; }''', compiler_flags.append ('-U__STRICT_ANSI__') if conf.options.cxx11 or conf.env['build_host'] in [ 'mavericks', 'yosemite' ]: - # conf.check_cxx(cxxflags=["-std=c++11"]) - # cxx_flags.append('-std=c++11') + conf.check_cxx(cxxflags=["-std=c++11"]) + cxx_flags.append('-std=c++11') if platform == "darwin": - # cxx_flags.append('--stdlib=libstdc++') + cxx_flags.append('--stdlib=libstdc++') # Mavericks and later changed the syntax to be used when including Carbon headers, # from requiring a full path to requiring just the header name. cxx_flags.append('-DCARBON_FLAT_HEADERS') - # linker_flags.append('--stdlib=libstdc++') + linker_flags.append('--stdlib=libstdc++') # Prevents visibility issues in standard headers conf.define("_DARWIN_C_SOURCE", 1)