TakeV/dxx-rebirth
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Precompute and save C++11 required feature list

Browse source 
The C++11 required feature string was computed once per configured
environment.  When two or more environments were configured in a single
run, this was wasteful.  Reorder the SConf tests to precompute the
string.
This commit is contained in:
Kp 2016-08-12 04:08:57 +00:00
parent 7b173c3570
commit 8a4908ea2f
1 changed files with 14 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
SConstruct
View file

@ -138,6 +138,11 @@ class ConfigureTests:
name = {'N' : 'test_' + name.replace(' ', '_')}
self.text = text % name
self.main = ('{' + (main % name) + '}\n') if main else ''
class CxxRequiredFeatures:
def __init__(self,features):
self.features = features
self.main = ''.join([f.main for f in features])
self.text = ''.join([f.text for f in features])
class PCHAction:
def __init__(self,context):
self._context = context
@ -272,7 +277,7 @@ class ConfigureTests:
_cxx_conformance_cxx11 = 11
_cxx_conformance_cxx14 = 14
__cxx_conformance = None
__cxx11_required_features = [
__cxx11_required_features = CxxRequiredFeatures([
Cxx11RequiredFeature('constexpr', '''
struct %(N)s {};
static constexpr %(N)s get_%(N)s(){return {};}
@ -352,7 +357,7 @@ struct %(N)s_derived : %(N)s_base {
m.emplace(0, 0);
'''
),
]
])
def __init__(self,msgprefix,user_settings,platform_settings):
self.msgprefix = msgprefix
self.user_settings = user_settings
@ -1369,24 +1374,18 @@ namespace B
using namespace B;
''', main='return A::a;', msg='whether compiler handles classes from "using namespace"', successflags=_successflags)
@_custom_test
def check_cxx11_required_features(self,context):
features = self.__cxx11_required_features
text = ''
main = ''
for f in features:
text += f.text
main += f.main
def check_cxx11_required_features(self,context,_features=__cxx11_required_features):
# First test all the features at once. If all work, then done.
# If any fail, then the configure run will stop.
if self.Compile(context, text=text, main=main, msg='for required C++11 features'):
_Compile = self.Compile
if _Compile(context, text=_features.text, main=_features.main, msg='for required C++11 features'):
return
# Some failed. Run each test separately and report to the user
# which ones failed.
raise SCons.Errors.StopError("C++ compiler does not support %s." %
', '.join(
[f.name for f in features if not self.Compile(context, text=f.text, main=f.main, msg='for C++11 %s' % f.name)]
)
)
failures = [f.name for f in _features.features if not _Compile(context, text=f.text, main=f.main, msg='for C++11 %s' % f.name)]
raise SCons.Errors.StopError(("C++ compiler does not support %s." %
', '.join(failures)
) if failures else 'C++ compiler supports each feature individually, but not all of them together. Please report this as a bug in the Rebirth configure script.')
@_custom_test
def check_constexpr_union_constructor(self,context,_successflags={'CPPDEFINES' : ['DXX_HAVE_CONSTEXPR_UNION_CONSTRUCTOR']}):
# https://gcc.gnu.org/bugzilla/show_bug.cgi?id=56583