From fb395b56dd2432b862c550bad7b4bbe1f205ec59 Mon Sep 17 00:00:00 2001
From: Andreas Hansson <andreas.hansson@arm.com>
Date: Thu, 22 Mar 2012 06:34:50 -0400
Subject: 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.
---
 src/SConscript                                        | 12 +++---------
 src/cpu/testers/networktest/SConscript                |  2 +-
 src/mem/ruby/common/SConscript                        |  2 +-
 src/mem/ruby/network/garnet/fixed-pipeline/SConscript |  4 ++--
 4 files changed, 7 insertions(+), 13 deletions(-)

(limited to 'src')

diff --git a/src/SConscript b/src/SConscript
index c017b601b..5a7d7d29d 100755
--- 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 5b6b18d42..06ab0f2aa 100644
--- 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 8c2442c00..d2cd2f457 100644
--- 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 0010f3d1a..82d11cb01 100644
--- 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')
-- 
cgit v1.2.3