Austin Harris has submitted this change. (
https://gem5-review.googlesource.com/c/public/gem5/+/50257 )
Change subject: scons: allow building gem5 in a nix environment
......................................................................
scons: allow building gem5 in a nix environment
Binaries in nixpkgs are wrapped to use NIX_ environment variables, so
add these to the variables used by scons so that gem5 can be built on a
system using nix.
Change-Id: Iad59db6a4c84d8c7131f309af83618ced1624cfb
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/50257
Reviewed-by: Gabe Black <gabe.bl...@gmail.com>
Maintainer: Gabe Black <gabe.bl...@gmail.com>
Tested-by: kokoro <noreply+kok...@google.com>
---
M site_scons/gem5_scons/defaults.py
1 file changed, 18 insertions(+), 0 deletions(-)
Approvals:
Gabe Black: Looks good to me, approved; Looks good to me, approved
kokoro: Regressions pass
diff --git a/site_scons/gem5_scons/defaults.py
b/site_scons/gem5_scons/defaults.py
index 8309505..1f8d5d5 100644
--- a/site_scons/gem5_scons/defaults.py
+++ b/site_scons/gem5_scons/defaults.py
@@ -55,6 +55,7 @@
"DISTCC_", # distcc (distributed compiler wrapper) config
"INCLUDE_SERVER_", # distcc pump server settings
"M5", # M5 configuration (e.g., path to kernels)
+ "NIX_", # wrapped binaries if using nix package manager
]
for key,val in sorted(os.environ.items()):
--
To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/50257
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: Iad59db6a4c84d8c7131f309af83618ced1624cfb
Gerrit-Change-Number: 50257
Gerrit-PatchSet: 6
Gerrit-Owner: Austin Harris <m...@austin-harris.com>
Gerrit-Reviewer: Austin Harris <m...@austin-harris.com>
Gerrit-Reviewer: Gabe Black <gabe.bl...@gmail.com>
Gerrit-Reviewer: kokoro <noreply+kok...@google.com>
Gerrit-CC: Bobby R. Bruce <bbr...@ucdavis.edu>
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
