Gabe Black has submitted this change and it was merged. (
https://gem5-review.googlesource.com/2947 )
Change subject: scons: Remove the SPAWN hack added earlier.
......................................................................
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 <[email protected]>
Reviewed-by: Jason Lowe-Power <[email protected]>
Maintainer: Andreas Sandberg <[email protected]>
---
M src/SConscript
1 file changed, 1 insertion(+), 12 deletions(-)
Approvals:
Jason Lowe-Power: Looks good to me, approved
Andreas Sandberg: Looks good to me, approved; Looks good to me, approved
diff --git a/src/SConscript b/src/SConscript
index 3742cdd..f1474c9 100755
--- a/src/SConscript
+++ b/src/SConscript
@@ -1241,18 +1241,7 @@
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':
--
To view, visit https://gem5-review.googlesource.com/2947
To unsubscribe, visit https://gem5-review.googlesource.com/settings
Gerrit-Project: public/gem5
Gerrit-Branch: master
Gerrit-MessageType: merged
Gerrit-Change-Id: I9e82a62083afd1414324a7fd697bd6d4b76367ae
Gerrit-Change-Number: 2947
Gerrit-PatchSet: 3
Gerrit-Owner: Gabe Black <[email protected]>
Gerrit-Reviewer: Andreas Sandberg <[email protected]>
Gerrit-Reviewer: Gabe Black <[email protected]>
Gerrit-Reviewer: Jason Lowe-Power <[email protected]>
Gerrit-Reviewer: Steve Reinhardt <[email protected]>
_______________________________________________
gem5-dev mailing list
[email protected]
http://m5sim.org/mailman/listinfo/gem5-dev
