commit db921c890e2133ebc1dbc2f91848f06df0374e49
author Bobby R. Bruce <bbruce@ucdavis.edu> Thu Dec 23 23:34:14 2021 -0800
committer Bobby Bruce <bbruce@ucdavis.edu> Mon Dec 27 05:58:04 2021 +0000
tree 548b474fea9144d0023cb47241f27fc9546074db
parent 594145849c43bf461ccf690ba21e664d9b0a9f7b

scons: Fix 'CheckLinkFlag' so '-Werror' is not enabled

A small error in 'CheckLinkFlag' was resulting in `-Werror` being set
as a CXXFLAG after the function was run. This patch fixes this.

Change-Id: I786f81a4f94be0356573eb6d4673d04ee5aa844d
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/54863
Maintainer: Bobby Bruce <bbruce@ucdavis.edu>
Reviewed-by: Gabe Black <gabe.black@gmail.com>
Tested-by: kokoro <noreply+kokoro@google.com>

site_scons/gem5_scons/configure.py

diff --git a/site_scons/gem5_scons/configure.py b/site_scons/gem5_scons/configure.py
index 835ef44..24a4a3d 100644
--- a/site_scons/gem5_scons/configure.py
+++ b/site_scons/gem5_scons/configure.py
@@ -62,7 +62,7 @@
     last_linkflags = context.env['LINKFLAGS']
     context.env.Append(LINKFLAGS=[flag])
     pre_werror = context.env['LINKFLAGS']
-    context.env.Append(CXXFLAGS=['-Werror'])
+    context.env.Append(LINKFLAGS=['-Werror'])
     ret = context.TryLink('int main(int, char *[]) { return 0; }', '.cc')
     context.env['LINKFLAGS'] = pre_werror
     if not (ret and autoadd):