Add %SYSTEMDRIVE% to the list of Windows variables preserved. (Chris Prince)

2 files changed, 8 insertions, 3 deletions

diff --git a/src/CHANGES.txt b/src/CHANGES.txt
index 88b202b..b01a41d 100644
--- a/src/CHANGES.txt
+++ b/src/CHANGES.txt
@@ -448,6 +448,9 @@ RELEASE 0.97 - XXX
   - Look in the right directory, not always the local directory, for a
     same-named file or directory conflict on disk.
 
+  - On Windows, preserve the external environment's %SYSTEMDRIVE%
+    variable, too.
+
   From Kevin Quick:
 
   - Fix the Builder name returned from ListBuilders and other instances
diff --git a/src/engine/SCons/Platform/win32.py b/src/engine/SCons/Platform/win32.py
index 6faf606..6188098 100644
--- a/src/engine/SCons/Platform/win32.py
+++ b/src/engine/SCons/Platform/win32.py
@@ -232,9 +232,11 @@ def generate(env):
     # environment's ENV.  This is a potential slippery slope, because we
     # *don't* want to make builds dependent on the user's environment by
     # default.  We're doing this for SYSTEMROOT, though, because it's
-    # needed for anything that uses sockets, and seldom changes.  Weigh
-    # the impact carefully before adding other variables to this list.
-    import_env = [ 'SYSTEMROOT', 'TEMP', 'TMP' ]
+    # needed for anything that uses sockets, and seldom changes, and
+    # for SYSTEMDRIVE because it's related.
+    #
+    # Weigh the impact carefully before adding other variables to this list.
+    import_env = [ 'SYSTEMDRIVE', 'SYSTEMROOT', 'TEMP', 'TMP' ]
     for var in import_env:
         v = os.environ.get(var)
         if v: