From 45cfd99ce90028046a7cf820b8726006dc8a36fc Mon Sep 17 00:00:00 2001 From: Austin Harris Date: Sat, 11 Sep 2021 16:18:33 -0500 Subject: [PATCH] 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 Maintainer: Gabe Black Tested-by: kokoro --- site_scons/gem5_scons/defaults.py | 1 + 1 file changed, 1 insertion(+) diff --git a/site_scons/gem5_scons/defaults.py b/site_scons/gem5_scons/defaults.py index 8309505b6c..1f8d5d577d 100644 --- a/site_scons/gem5_scons/defaults.py +++ b/site_scons/gem5_scons/defaults.py @@ -55,6 +55,7 @@ def EnvDefaults(env): "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()):