175c175
< def __init__(self, source, tags=None, add_tags=None, Werror=True):
---
> def __init__(self, source, tags=None, add_tags=None):
179d178
< self.Werror = Werror
955,961c954,956
< werror_env = new_env.Clone()
< # Treat warnings as errors but white list some warnings that we
< # want to allow (e.g., deprecation warnings).
< werror_env.Append(CCFLAGS=['-Werror',
< '-Wno-error=deprecated-declarations',
< '-Wno-error=deprecated',
< ])
---
> def make_obj(source, static, extra_deps=None):
> '''This function creates a scons node of the requested type, and sets
> up any additional dependencies.'''
963,972d957
< def make_obj(source, static, extra_deps = None):
< '''This function adds the specified source to the correct
< build environment, and returns the corresponding SCons Object
< nodes'''
<
< if source.Werror:
< env = werror_env
< else:
< env = new_env
<
974c959
< obj = env.StaticObject(source.tnode)
---
> obj = new_env.StaticObject(source.tnode)
976c961
< obj = env.SharedObject(source.tnode)
---
> obj = new_env.SharedObject(source.tnode)
979c964
< env.Depends(obj, extra_deps)
---
> new_env.Depends(obj, extra_deps)