build: Always build in C++11 mode.
Change-Id: Ib3adcb0f2faff2e8bd2036d4e296052c5eaef94f
diff --git a/waf-tools/default-compiler-flags.py b/waf-tools/default-compiler-flags.py
index 5ffba5e..190c9a1 100644
--- a/waf-tools/default-compiler-flags.py
+++ b/waf-tools/default-compiler-flags.py
@@ -4,21 +4,14 @@
def options(opt):
opt.add_option('--debug', '--with-debug', action='store_true', default=False, dest='debug',
- help='''Compile in debugging mode without all optimizations (-O0)''')
- opt.add_option('--with-c++11', action='store_true', default=False, dest='use_cxx11',
- help='''Use C++ 11 features if available in the compiler''')
+ help='''Compile in debugging mode without optimizations (-O0 or -Og)''')
def configure(conf):
areCustomCxxflagsPresent = (len(conf.env.CXXFLAGS) > 0)
- defaultFlags = []
-
- if conf.options.use_cxx11:
- defaultFlags += ['-std=c++0x', '-std=c++11']
- else:
- defaultFlags += ['-std=c++03', '-Wno-variadic-macros', '-Wno-c99-extensions']
-
- defaultFlags += ['-pedantic', '-Wall', '-Wno-long-long', '-Wno-unneeded-internal-declaration',
- '-Wno-c++11-extensions', '-Wno-nested-anon-types']
+ defaultFlags = ['-std=c++0x', '-std=c++11',
+ '-stdlib=libc++', # clang on OSX < 10.9 by default uses gcc's
+ # libstdc++, which is not C++11 compatible
+ '-Wall', '-Wno-nested-anon-types']
if conf.options.debug:
conf.define('_DEBUG', 1)
@@ -32,6 +25,7 @@
'-Wno-unused-variable',
'-Wno-error=deprecated-register',
'-Wno-error=maybe-uninitialized', # Bug #1615
+ '-Wno-error=unneeded-internal-declaration', # Bug #1588
]
if areCustomCxxflagsPresent:
missingFlags = [x for x in defaultFlags if x not in conf.env.CXXFLAGS]
@@ -46,12 +40,15 @@
if not areCustomCxxflagsPresent:
conf.add_supported_cxxflags(defaultFlags)
+ # clang on OSX < 10.9 by default uses gcc's libstdc++, which is not C++11 compatible
+ conf.add_supported_linkflags(['-stdlib=libc++'])
+
@Configure.conf
def add_supported_cxxflags(self, cxxflags):
"""
Check which cxxflags are supported by compiler and add them to env.CXXFLAGS variable
"""
- self.start_msg('Checking allowed flags for c++ compiler')
+ self.start_msg('Checking supported CXXFLAGS')
supportedFlags = []
for flag in cxxflags:
@@ -60,3 +57,18 @@
self.end_msg(' '.join(supportedFlags))
self.env.CXXFLAGS = supportedFlags + self.env.CXXFLAGS
+
+@Configure.conf
+def add_supported_linkflags(self, linkflags):
+ """
+ Check which linkflags are supported by compiler and add them to env.LINKFLAGS variable
+ """
+ self.start_msg('Checking supported LINKFLAGS')
+
+ supportedFlags = []
+ for flag in linkflags:
+ if self.check_cxx(linkflags=['-Werror', flag], mandatory=False):
+ supportedFlags += [flag]
+
+ self.end_msg(' '.join(supportedFlags))
+ self.env.LINKFLAGS = supportedFlags + self.env.LINKFLAGS