From 555cdefb345f96666eb46baf82f0131ec83c506e Mon Sep 17 00:00:00 2001 From: Gabe Black Date: Fri, 9 Jul 2021 16:13:09 -0700 Subject: [PATCH] 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 --- src/SConscript | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/src/SConscript b/src/SConscript index d5a5b88997..6a630daad5 100644 --- a/src/SConscript +++ b/src/SConscript @@ -1345,7 +1345,7 @@ if main['USE_PYTHON']: # 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 @@ def makeEnv(env, label, objsfx, strip=False, **kwargs): # 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 @@ def makeEnv(env, label, objsfx, strip=False, **kwargs): 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'],