Scons: Remove Werror=False in SConscript files

This patch removes the overriding of "-Werror" in a handful of
cases. The code compiles with gcc 4.6.3 and clang 3.0 without any
warnings, and thus without any errors. There are no functional changes
introduced by this patch. In the future, rather than ypassing
"-Werror", address the warnings.

diff --git a/src/SConscript b/src/SConscript
index c017b601b1a263c843b4d2c96ab0bd16a242e144..5a7d7d29dee95941213559e1eef23d27ecc637fc 100755 (executable)
--- a/src/SConscript
+++ b/src/SConscript
@@ -151,11 +151,10 @@ class SourceFile(object):
         
 class Source(SourceFile):
     '''Add a c/c++ source file to the build'''
-    def __init__(self, source, Werror=True, swig=False, **guards):
+    def __init__(self, source, swig = False, **guards):
         '''specify the source file, and any guards'''
         super(Source, self).__init__(source, **guards)
 
-        self.Werror = Werror
         self.swig = swig
 
 class PySource(SourceFile):
@@ -844,9 +843,10 @@ def makeEnv(label, objsfx, strip = False, **kwargs):
     new_env = env.Clone(OBJSUFFIX=objsfx, SHOBJSUFFIX=objsfx + 's')
     new_env.Label = label
     new_env.Append(**kwargs)
+    # Always consider warnings errors
+    new_env.Append(CCFLAGS='-Werror')
 
     swig_env = new_env.Clone()
-    swig_env.Append(CCFLAGS='-Werror')
     if env['GCC']:
         swig_env.Append(CCFLAGS='-Wno-uninitialized')
         swig_env.Append(CCFLAGS='-Wno-sign-compare')
@@ -857,10 +857,6 @@ def makeEnv(label, objsfx, strip = False, **kwargs):
     if env['CLANG']:
         swig_env.Append(CCFLAGS=['-Wno-unused-label'])
 
-
-    werror_env = new_env.Clone()
-    werror_env.Append(CCFLAGS='-Werror')
-
     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
@@ -868,8 +864,6 @@ def makeEnv(label, objsfx, strip = False, **kwargs):
 
         if source.swig:
             env = swig_env
-        elif source.Werror:
-            env = werror_env
         else:
             env = new_env
 

diff --git a/src/cpu/testers/networktest/SConscript b/src/cpu/testers/networktest/SConscript
index 5b6b18d4265a51094f97e66a90d62b80a9c4f6c5..06ab0f2aa003fb5fbc0fb40cc985b25415b5622b 100644 (file)
--- a/src/cpu/testers/networktest/SConscript
+++ b/src/cpu/testers/networktest/SConscript
@@ -32,6 +32,6 @@ Import('*')
 
 SimObject('NetworkTest.py')
 
-Source('networktest.cc', Werror=False)
+Source('networktest.cc')
 
 DebugFlag('NetworkTest')

diff --git a/src/mem/ruby/common/SConscript b/src/mem/ruby/common/SConscript
index 8c2442c0079c4c1bf1f9957dd8036b464b9103dc..d2cd2f457534bdd885622523629ac91487efb561 100644 (file)
--- a/src/mem/ruby/common/SConscript
+++ b/src/mem/ruby/common/SConscript
@@ -39,5 +39,5 @@ Source('Driver.cc')
 Source('Global.cc')
 Source('Histogram.cc')
 Source('NetDest.cc')
-Source('Set.cc', Werror=False)
+Source('Set.cc')
 Source('SubBlock.cc')

diff --git a/src/mem/ruby/network/garnet/fixed-pipeline/SConscript b/src/mem/ruby/network/garnet/fixed-pipeline/SConscript
index 0010f3d1ae5f656e01eb68f13089497344c66702..82d11cb014c9f06203c41bf1ea491df411917c96 100644 (file)
--- a/src/mem/ruby/network/garnet/fixed-pipeline/SConscript
+++ b/src/mem/ruby/network/garnet/fixed-pipeline/SConscript
@@ -38,8 +38,8 @@ SimObject('GarnetNetwork_d.py')
 SimObject('GarnetRouter_d.py')
 
 Source('GarnetLink_d.cc')
-Source('GarnetNetwork_d.cc', Werror=False)
-Source('InputUnit_d.cc', Werror=False)
+Source('GarnetNetwork_d.cc')
+Source('InputUnit_d.cc')
 Source('NetworkInterface_d.cc')
 Source('NetworkLink_d.cc')
 Source('OutVcState_d.cc')