Gabe Black has submitted this change. (
https://gem5-review.googlesource.com/c/public/gem5/+/56752 )
Change subject: scons: Turn a lot of compiler flag vars into env vars.
..
scons: Turn a lot of compiler flag vars into env vars.
These are used to adapt gem5 to the system it's being built on, and so
should be attached to the host via the environment rather than gem5's
configuration.
Change-Id: I2adfe1af484dcdeae32a48097d9aa87752a7ed2a
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/56752
Reviewed-by: Daniel Carvalho
Maintainer: Gabe Black
Tested-by: kokoro
Reviewed-by: Andreas Sandberg
---
M SConstruct
M site_scons/gem5_scons/defaults.py
2 files changed, 27 insertions(+), 9 deletions(-)
Approvals:
Andreas Sandberg: Looks good to me, approved
Daniel Carvalho: Looks good to me, but someone else must approve
Gabe Black: Looks good to me, approved
kokoro: Regressions pass
diff --git a/SConstruct b/SConstruct
index ec36532..000e526 100755
--- a/SConstruct
+++ b/SConstruct
@@ -253,13 +253,6 @@
global_vars = Variables(global_vars_file, args=ARGUMENTS)
global_vars.AddVariables(
-('CCFLAGS_EXTRA', 'Extra C and C++ compiler flags', ''),
-('GEM5PY_CCFLAGS_EXTRA', 'Extra C and C++ gem5py compiler flags', ''),
-('GEM5PY_LINKFLAGS_EXTRA', 'Extra marshal gem5py flags', ''),
-('LINKFLAGS_EXTRA', 'Extra linker flags', ''),
-('PYTHON_CONFIG', 'Python config binary to use',
- [ 'python3-config', 'python-config']
-),
('BATCH', 'Use batch pool for build and tests', False),
('BATCH_CMD', 'Batch pool submission command name', 'qdo'),
('M5_BUILD_CACHE', 'Cache built objects in this directory', False),
diff --git a/site_scons/gem5_scons/defaults.py
b/site_scons/gem5_scons/defaults.py
index 4efaa26..4382937 100644
--- a/site_scons/gem5_scons/defaults.py
+++ b/site_scons/gem5_scons/defaults.py
@@ -46,7 +46,9 @@
# export TERM so that clang reports errors in color
use_vars = set([ 'AS', 'AR', 'CC', 'CXX', 'HOME', 'LD_LIBRARY_PATH',
'LIBRARY_PATH', 'PATH', 'PKG_CONFIG_PATH', 'PROTOC',
- 'PYTHONPATH', 'RANLIB', 'TERM' ])
+ 'PYTHONPATH', 'RANLIB', 'TERM', 'PYTHON_CONFIG',
+ 'CCFLAGS_EXTRA', 'GEM5PY_CCFLAGS_EXTRA',
+ 'GEM5PY_LINKFLAGS_EXTRA', 'LINKFLAGS_EXTRA'])
use_prefixes = [
"ASAN_", # address sanitizer symbolizer path and settings
@@ -68,7 +70,12 @@
var_overrides = {
'CC': env['CC'],
'CXX': env['CXX'],
-'PROTOC': 'protoc'
+'PROTOC': 'protoc',
+'PYTHON_CONFIG': [ 'python3-config', 'python-config' ],
+'CCFLAGS_EXTRA': '',
+'GEM5PY_CCFLAGS_EXTRA': '',
+'GEM5PY_LINKFLAGS_EXTRA': '',
+'LINKFLAGS_EXTRA': '',
}
for key,default in var_overrides.items():
env[key] = env['ENV'].get(key, default)
--
To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/56752
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: I2adfe1af484dcdeae32a48097d9aa87752a7ed2a
Gerrit-Change-Number: 56752
Gerrit-PatchSet: 9
Gerrit-Owner: Gabe Black
Gerrit-Reviewer: Andreas Sandberg
Gerrit-Reviewer: Daniel Carvalho
Gerrit-Reviewer: Gabe Black
Gerrit-Reviewer: kokoro
Gerrit-MessageType: merged
___
gem5-dev mailing list -- gem5-dev@gem5.org
To unsubscribe send an email to gem5-dev-le...@gem5.org
%(web_page_url)slistinfo%(cgiext)s/%(_internal_name)s
