From c0ae17c5d4c920a71080255aa2852e158d852d3c Mon Sep 17 00:00:00 2001
From: "Bobby R. Bruce" <bbruce@ucdavis.edu>
Date: Wed, 30 Sep 2020 20:53:14 -0700
Subject: [PATCH] misc: Re-add -Werror for the gem5 20.2 development

This reverts commit 2a4357bfd0c688a19cfd6b1c600bb2d2d6fa6151,
https://gem5-review.googlesource.com/c/public/gem5/+/35455

Change-Id: I10de506658bcad542abbb6d2b4f0c416d55bc121
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/35495
Reviewed-by: Bobby R. Bruce <bbruce@ucdavis.edu>
Maintainer: Bobby R. Bruce <bbruce@ucdavis.edu>
Tested-by: kokoro <noreply+kokoro@google.com>
---
 SConstruct | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/SConstruct b/SConstruct
index ce9e9b6c5..8e7ec3481 100755
--- a/SConstruct
+++ b/SConstruct
@@ -337,6 +337,12 @@ if main['GCC'] or main['CLANG']:
     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:
     error('\n'.join((
           "Don't know what compiler options to use for your compiler.",
-- 
2.30.2