summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGabe Black <gabeblack@google.com>2017-04-28 04:11:38 -0700
committerGabe Black <gabeblack@google.com>2017-05-01 23:28:22 +0000
commit359cb08623324b62d7c34973ae54d5bc7f23f9fd (patch)
treeb01d561e1b2e9fd177ac776d7b3e726d85bce3e4
parent8d476b41e60cfdadbde50c2d9ae54900455f6098 (diff)
downloadgem5-359cb08623324b62d7c34973ae54d5bc7f23f9fd.tar.xz
scons: Remove the SPAWN hack added earlier.
A previous change forced scons to spawn child processes by exec-ing it directly rather than going through the shell because the command line length would be too long for the shell to handle. Now that incremental linking should keep the command line lengths more under control, that change should no longer be necessary. Change-Id: I9e82a62083afd1414324a7fd697bd6d4b76367ae Reviewed-on: https://gem5-review.googlesource.com/2947 Reviewed-by: Andreas Sandberg <andreas.sandberg@arm.com> Reviewed-by: Jason Lowe-Power <jason@lowepower.com> Maintainer: Andreas Sandberg <andreas.sandberg@arm.com>
-rwxr-xr-xsrc/SConscript13
1 files changed, 1 insertions, 12 deletions
diff --git a/src/SConscript b/src/SConscript
index 3742cdd83..f1474c982 100755
--- a/src/SConscript
+++ b/src/SConscript
@@ -1241,18 +1241,7 @@ def makeEnv(env, label, objsfx, strip = False, **kwargs):
if strip:
progname += '.unstripped'
- # When linking the gem5 binary, the command line can be too big for the
- # shell to handle. Use "subprocess" to spawn processes without passing
- # through the shell to avoid this problem. That means we also can't use
- # shell syntax in any of the commands this will run, but that isn't
- # currently an issue.
- def spawn_with_subprocess(sh, escape, cmd, args, env):
- return subprocess.call(args, env=env)
-
- # Since we're not running through a shell, no escaping is necessary either.
- targets = new_env.Program(progname, main_objs + static_objs,
- SPAWN=spawn_with_subprocess,
- ESCAPE=lambda x: x)
+ targets = new_env.Program(progname, main_objs + static_objs)
if strip:
if sys.platform == 'sunos5':