Gabe Black has submitted this change. (
https://gem5-review.googlesource.com/c/public/gem5/+/56890 )
(
5 is the latest approved patch-set.
No files were changed between the latest approved patch-set and the
submitted one.
)Change subject: scons: Use env and not main in SConscripts.
......................................................................
scons: Use env and not main in SConscripts.
"env" is the environment for the current variant, where "main" is the
environment that was derived from.
Change-Id: I71e30684aa82a297241820502f204400c89c80cf
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/56890
Maintainer: Gabe Black <[email protected]>
Tested-by: kokoro <[email protected]>
Reviewed-by: Daniel Carvalho <[email protected]>
---
M src/base/stats/SConscript
M src/systemc/core/SConscript
M src/systemc/dt/int/SConscript
3 files changed, 20 insertions(+), 4 deletions(-)
Approvals:
Daniel Carvalho: Looks good to me, approved
Gabe Black: Looks good to me, approved
kokoro: Regressions pass
diff --git a/src/base/stats/SConscript b/src/base/stats/SConscript
index 841e455..f81bd24 100644
--- a/src/base/stats/SConscript
+++ b/src/base/stats/SConscript
@@ -35,7 +35,7 @@
Source('text.cc')
if env['HAVE_HDF5']:
- if main['GCC']:
+ if env['GCC']:
Source('hdf5.cc', append={'CXXFLAGS': '-Wno-deprecated-copy'})
else:
Source('hdf5.cc')
diff --git a/src/systemc/core/SConscript b/src/systemc/core/SConscript
index 45bad4f..b439fbe 100644
--- a/src/systemc/core/SConscript
+++ b/src/systemc/core/SConscript
@@ -65,7 +65,7 @@
Source('python.cc')
Source('sc_main_python.cc')
append = {}
- with gem5_scons.Configure(main) as conf:
+ with gem5_scons.Configure(env) as conf:
for flag in
('-Wno-self-assign-overloaded', '-Wno-self-assign'):
if conf.CheckCxxFlag(flag, autoadd=False):
append['CCFLAGS'] = [flag]
@@ -73,7 +73,7 @@
Source('sc_time_python.cc', append=append)
# Disable the false positive warning for the event members of the
scheduler.
- with gem5_scons.Configure(main) as conf:
+ with gem5_scons.Configure(env) as conf:
flag = '-Wno-free-nonheap-object'
append = {}
if conf.CheckCxxFlag(flag, autoadd=False):
diff --git a/src/systemc/dt/int/SConscript b/src/systemc/dt/int/SConscript
index 159eb6f..10b3560 100644
--- a/src/systemc/dt/int/SConscript
+++ b/src/systemc/dt/int/SConscript
@@ -28,7 +28,7 @@
from gem5_scons.util import compareVersions
if env['USE_SYSTEMC']:
- if main['GCC'] and compareVersions(main['CXXVERSION'], '10.0') >= 0:
+ if env['GCC'] and compareVersions(env['CXXVERSION'], '10.0') >= 0:
disable_false_positives = {
"CCFLAGS": [ "-Wno-array-bounds",
"-Wno-stringop-overflow" ]
--
To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/56890
To unsubscribe, or for help writing mail filters, visit
https://gem5-review.googlesource.com/settings
Gerrit-Project: public/gem5
Gerrit-Branch: develop
Gerrit-Change-Id: I71e30684aa82a297241820502f204400c89c80cf
Gerrit-Change-Number: 56890
Gerrit-PatchSet: 7
Gerrit-Owner: Gabe Black <[email protected]>
Gerrit-Reviewer: Andreas Sandberg <[email protected]>
Gerrit-Reviewer: Daniel Carvalho <[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
