Bobby Bruce has submitted this change. (
https://gem5-review.googlesource.com/c/public/gem5/+/54863 )
Change subject: scons: Fix 'CheckLinkFlag' so '-Werror' is not enabled
......................................................................
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 <[email protected]>
Reviewed-by: Gabe Black <[email protected]>
Tested-by: kokoro <[email protected]>
---
M site_scons/gem5_scons/configure.py
1 file changed, 17 insertions(+), 1 deletion(-)
Approvals:
Gabe Black: Looks good to me, approved
Bobby Bruce: Looks good to me, approved
kokoro: Regressions pass
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):
--
To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/54863
To unsubscribe, or for help writing mail filters, visit
https://gem5-review.googlesource.com/settings
Gerrit-Project: public/gem5
Gerrit-Branch: release-staging-v21-2
Gerrit-Change-Id: I786f81a4f94be0356573eb6d4673d04ee5aa844d
Gerrit-Change-Number: 54863
Gerrit-PatchSet: 2
Gerrit-Owner: Bobby Bruce <[email protected]>
Gerrit-Reviewer: Bobby Bruce <[email protected]>
Gerrit-Reviewer: Gabe Black <[email protected]>
Gerrit-Reviewer: kokoro <[email protected]>
Gerrit-MessageType: merged
_______________________________________________
gem5-dev mailing list -- [email protected]
To unsubscribe send an email to [email protected]
%(web_page_url)slistinfo%(cgiext)s/%(_internal_name)s
