diff --git a/SConstruct b/SConstruct
index 36db216..09c3476 100755
--- a/SConstruct
+++ b/SConstruct
@@ -359,6 +359,13 @@
     shared_partial_flags = ['-r', '-nostdlib']
     main.Append(PSHLINKFLAGS=shared_partial_flags)
     main.Append(PLINKFLAGS=shared_partial_flags)
+
+    # Treat warnings as errors but white list some warnings that we
+    # want to allow (e.g., deprecation warnings).
+    main.Append(CCFLAGS=['-Werror',
+                         '-Wno-error=deprecated-declarations',
+                         '-Wno-error=deprecated',
+                        ])
 else:
     print termcap.Yellow + termcap.Bold + 'Error' + termcap.Normal,
     print "Don't know what compiler options to use for your compiler."
diff --git a/src/SConscript b/src/SConscript
index a40955b..34bbcc0 100755
--- a/src/SConscript
+++ b/src/SConscript
@@ -172,11 +172,10 @@
         self.tags.add(Source._current_group_tag)
 
     '''Add a c/c++ source file to the build'''
-    def __init__(self, source, tags=None, add_tags=None, Werror=True):
+    def __init__(self, source, tags=None, add_tags=None):
         '''specify the source file, and any tags'''
         super(Source, self).__init__(source, tags, add_tags)
         self._add_link_group_tag()
-        self.Werror = Werror
 
 class PySource(SourceFile):
     '''Add a python source file to the named package'''
@@ -952,31 +951,17 @@
     new_env.Label = label
     new_env.Append(**kwargs)
 
-    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 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
+    def make_obj(source, static, extra_deps=None):
+        '''This function creates a scons node of the requested type, and sets
+        up any additional dependencies.'''
 
         if static:
-            obj = env.StaticObject(source.tnode)
+            obj = new_env.StaticObject(source.tnode)
         else:
-            obj = env.SharedObject(source.tnode)
+            obj = new_env.SharedObject(source.tnode)
 
         if extra_deps:
-            env.Depends(obj, extra_deps)
+            new_env.Depends(obj, extra_deps)
 
         return obj