Gabe Black has submitted this change. (
https://gem5-review.googlesource.com/c/public/gem5/+/40967 )
Change subject: scons: Move the "duplicate" setting into
gem5_env_defaults.py.
......................................................................
scons: Move the "duplicate" setting into gem5_env_defaults.py.
This is a generic default environment setting, and so should go
alongside all the other generic default environment settings.
Change-Id: If3032a4893dd84f7c7d77e7e9420436ab445cf2b
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/40967
Maintainer: Gabe Black <gabe.bl...@gmail.com>
Tested-by: kokoro <noreply+kok...@google.com>
Reviewed-by: Andreas Sandberg <andreas.sandb...@arm.com>
---
M SConstruct
M site_scons/gem5_scons/defaults.py
2 files changed, 6 insertions(+), 6 deletions(-)
Approvals:
Andreas Sandberg: Looks good to me, approved
Gabe Black: Looks good to me, approved
kokoro: Regressions pass
diff --git a/SConstruct b/SConstruct
index a146115..d235414 100755
--- a/SConstruct
+++ b/SConstruct
@@ -203,12 +203,6 @@
main.SConsignFile(os.path.join(build_root, "sconsign"))
-# Default duplicate option is to use hard links, but this messes up
-# when you use emacs to edit a file in the target dir, as emacs moves
-# file to file~ then copies to file, breaking the link. Symbolic
-# (soft) links work better.
-main.SetOption('duplicate', 'soft-copy')
-
#
# Set up global sticky variables... these are common to an entire build
# tree (not specific to a particular build like X86)
diff --git a/site_scons/gem5_scons/defaults.py
b/site_scons/gem5_scons/defaults.py
index e59b40f..8309505 100644
--- a/site_scons/gem5_scons/defaults.py
+++ b/site_scons/gem5_scons/defaults.py
@@ -71,3 +71,9 @@
# add useful python code PYTHONPATH so it can be used by subprocesses
# as well
env.AppendENVPath('PYTHONPATH', extra_python_paths)
+
+ # Default duplicate option is to use hard links, but this messes up
+ # when you use emacs to edit a file in the target dir, as emacs moves
+ # file to file~ then copies to file, breaking the link. Symbolic
+ # (soft) links work better.
+ env.SetOption('duplicate', 'soft-copy')
7 is the latest approved patch-set.
No files were changed between the latest approved patch-set and the
submitted one.
--
To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/40967
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: If3032a4893dd84f7c7d77e7e9420436ab445cf2b
Gerrit-Change-Number: 40967
Gerrit-PatchSet: 18
Gerrit-Owner: Gabe Black <gabe.bl...@gmail.com>
Gerrit-Reviewer: Andreas Sandberg <andreas.sandb...@arm.com>
Gerrit-Reviewer: Gabe Black <gabe.bl...@gmail.com>
Gerrit-Reviewer: Giacomo Travaglini <giacomo.travagl...@arm.com>
Gerrit-Reviewer: kokoro <noreply+kok...@google.com>
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
