Blacklist moving _REENTRANT to dxxsconf.h
Passing -pthread implies -D_REENTRANT, so if -D_REENTRANT is moved to dxxsconf.h, then _REENTRANT is defined twice.
This commit is contained in:
parent
28a5b70c7c
commit
d9bfced915
10
SConstruct
10
SConstruct
|
@ -179,10 +179,18 @@ class ConfigureTests:
|
|||
if r and forced != self.sconf_assume_success:
|
||||
caller_modified_env_flags.restore(context.env)
|
||||
context.env.Replace(CPPDEFINES=env_flags['CPPDEFINES'])
|
||||
for d in successflags.pop('CPPDEFINES', []):
|
||||
CPPDEFINES = []
|
||||
for v in successflags.pop('CPPDEFINES', []):
|
||||
d = v
|
||||
if isinstance(d, str):
|
||||
d = (d,None)
|
||||
if d[0] in ('_REENTRANT',):
|
||||
# Blacklist defines that must not be moved to the
|
||||
# configuration header.
|
||||
CPPDEFINES.append(v)
|
||||
continue
|
||||
context.sconf.Define(d[0], d[1])
|
||||
successflags['CPPDEFINES'] = CPPDEFINES
|
||||
for (k,v) in successflags.items():
|
||||
self._extend_successflags(k, v)
|
||||
else:
|
||||
|
|
Loading…
Reference in a new issue