Hoa Nguyen has uploaded this change for review. (
https://gem5-review.googlesource.com/c/public/gem5/+/41601 )
Change subject: scons: Fix gem5 failed to build with scons 4.0.1 and 4.1.0
......................................................................
scons: Fix gem5 failed to build with scons 4.0.1 and 4.1.0
SCons failed to find m5 module while loading m5.util.terminal
from site_scons/gem5_scons/util.py.
This results in the current version of gem5 stable failed to
build with scons 4.0.1 and 4.1.0.
The nature of the bug and the explaination for the fix can be
found here,
https://gem5-review.googlesource.com/c/public/gem5/+/38616
Jira: https://gem5.atlassian.net/browse/GEM5-916
Change-Id: I3817f39ebc3021fb6fc89bcd09a96999f8ca2841
Signed-off-by: Hoa Nguyen <hoangu...@ucdavis.edu>
---
M SConstruct
M site_scons/site_tools/default.py
2 files changed, 1 insertion(+), 7 deletions(-)
diff --git a/SConstruct b/SConstruct
index 0d8159b..bb038b8 100755
--- a/SConstruct
+++ b/SConstruct
@@ -139,7 +139,7 @@
#
########################################################################
-main = Environment()
+main = Environment(tools=['default', 'git'])
from gem5_scons.util import get_termcap
termcap = get_termcap()
diff --git a/site_scons/site_tools/default.py
b/site_scons/site_tools/default.py
index 1965a20..88a6932 100644
--- a/site_scons/site_tools/default.py
+++ b/site_scons/site_tools/default.py
@@ -78,15 +78,9 @@
# as well
env.AppendENVPath('PYTHONPATH', extra_python_paths)
-gem5_tool_list = [
- 'git',
-]
-
def generate(env):
common_config(env)
SCons.Tool.default.generate(env)
- for tool in gem5_tool_list:
- SCons.Tool.Tool(tool)(env)
def exists(env):
return 1
--
To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/41601
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: I3817f39ebc3021fb6fc89bcd09a96999f8ca2841
Gerrit-Change-Number: 41601
Gerrit-PatchSet: 1
Gerrit-Owner: Hoa Nguyen <hoangu...@ucdavis.edu>
Gerrit-MessageType: newchange
_______________________________________________
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
