1. SCons
  2. Core
  3. SCons

Commits

Steven Knight  committed 81d025c

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

  • Participants
  • Parent commits 71820d1
  • Branches default

Comments (0)

Files changed (3)

File doc/man/scons.1

View file
 Note that the
 .B win32
 platform adds the
+.B SYSTEMDRIVE
+and
 .B SYSTEMROOT
-variable from the user's external environment
+variables from the user's external environment
 to the construction environment's
 .B ENV
 dictionary.
 Note that the
 .B win32
 platform adds the
+.B SYSTEMDRIVE
+and
 .B SYSTEMROOT
-variable from the user's external environment
+variables from the user's external environment
 to the construction environment's
 .B ENV
 dictionary.

File src/CHANGES.txt

View file
   - 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

File src/engine/SCons/Platform/win32.py

View file
     # 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: