Gabe Black has submitted this change. (
https://gem5-review.googlesource.com/c/public/gem5/+/48119 )
Change subject: scons: Stop providing an "m5" hard link to the gem5 binary.
..
scons: Stop providing an "m5" hard link to the gem5 binary.
gem5 has been called gem5 for a long time, and the m5 binary has not
properly existed for a long time as well. Users have had a very long
time to move to the new binary name, so it should be safe to remove this
bit of legacy cruft.
Change-Id: I8a8ac14f29d25d48afa9db0d906ed4056ac8e961
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/48119
Reviewed-by: Daniel Carvalho
Reviewed-by: Jason Lowe-Power
Maintainer: Jason Lowe-Power
Tested-by: kokoro
---
M src/SConscript
1 file changed, 1 insertion(+), 7 deletions(-)
Approvals:
Jason Lowe-Power: Looks good to me, approved; Looks good to me, approved
Daniel Carvalho: Looks good to me, but someone else must approve
kokoro: Regressions pass
diff --git a/src/SConscript b/src/SConscript
index d5a5b88..6a630da 100644
--- a/src/SConscript
+++ b/src/SConscript
@@ -1345,7 +1345,7 @@
# List of constructed environments to pass back to SConstruct
date_source = Source('base/date.cc', tags=[])
-gem5_binary = Gem5('gem5')
+Gem5('gem5')
# Function to create a new build environment as clone of current
# environment 'env' with modified object suffix and optional stripped
@@ -1355,7 +1355,6 @@
# SCons doesn't know to append a library suffix when there is a '.' in
the
# name. Use '_' instead.
libname = 'gem5_' + label
-secondary_exename = 'm5.' + label
new_env = env.Clone(OBJSUFFIX=objsfx, SHOBJSUFFIX=objsfx + 's')
new_env.Label = label
@@ -1403,11 +1402,6 @@
for cls in ExecutableMeta.all:
cls.declare_all(new_env)
-new_env.M5Binary = File(gem5_binary.path(new_env))
-
-new_env.Command(secondary_exename, new_env.M5Binary,
-MakeAction('ln $SOURCE $TARGET', Transform("HARDLINK")))
-
# Start out with the compiler flags common to all compilers,
# i.e. they all use -g for opt and -g -pg for prof
ccflags = {'debug' : [], 'opt' : ['-g'], 'fast' : [], 'prof' :
['-g', '-pg'],
--
To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/48119
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: I8a8ac14f29d25d48afa9db0d906ed4056ac8e961
Gerrit-Change-Number: 48119
Gerrit-PatchSet: 3
Gerrit-Owner: Gabe Black
Gerrit-Reviewer: Bobby R. Bruce
Gerrit-Reviewer: Daniel Carvalho
Gerrit-Reviewer: Gabe Black
Gerrit-Reviewer: Jason Lowe-Power
Gerrit-Reviewer: Jason Lowe-Power
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
