diff options
| author | Steven Knight <knight@baldmt.com> | 2003-06-18 21:34:03 (GMT) |
|---|---|---|
| committer | Steven Knight <knight@baldmt.com> | 2003-06-18 21:34:03 (GMT) |
| commit | 227953151fc2db46ac525c94d5ba585cbf838181 (patch) | |
| tree | 6f0772d1712c28adb1c6fc926c1de0ccde1aa7f2 /src | |
| parent | 311058e447522c96a320b81bc8beaca41112c006 (diff) | |
| download | SCons-227953151fc2db46ac525c94d5ba585cbf838181.zip SCons-227953151fc2db46ac525c94d5ba585cbf838181.tar.gz SCons-227953151fc2db46ac525c94d5ba585cbf838181.tar.bz2 | |
Fix SConf chdir'ing so it works with CPPPATH and LIBPATH. (David Snopek)
Diffstat (limited to 'src')
| -rw-r--r-- | src/engine/SCons/SConf.py | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/engine/SCons/SConf.py b/src/engine/SCons/SConf.py index b62dabf..fad2dfb 100644 --- a/src/engine/SCons/SConf.py +++ b/src/engine/SCons/SConf.py @@ -186,8 +186,9 @@ class SConf: sys.stderr = self.logstream # the engine assumes the current path is the SConstruct directory ... - oldcwd = os.getcwd() - os.chdir(SConfFS.pathTop) + old_fs_dir = SConfFS.getcwd() + old_os_dir = os.getcwd() + SConfFS.chdir(SConfFS.Top, change_os_dir=1) self._setCache( nodes ) ret = 1 @@ -220,7 +221,8 @@ class SConf: # the node could not be built. we return 0 in this case ret = 0 finally: - os.chdir(oldcwd) + os.chdir(old_os_dir) + SConfFS.chdir(old_fs_dir, change_os_dir=0) if self.logstream != None: # restore stdout / stderr sys.stdout = oldStdout |