diff options
| author | Steven Knight <knight@baldmt.com> | 2003-10-21 05:17:36 (GMT) |
|---|---|---|
| committer | Steven Knight <knight@baldmt.com> | 2003-10-21 05:17:36 (GMT) |
| commit | 41327e986275b57ad9ff92d402276ffb318e9e7b (patch) | |
| tree | 16ff259ccaf68ef4255ab4b9105c43b406240072 /src/engine/SCons/Script/SConscript.py | |
| parent | 58807b5c04899a53783122c3296b5d6cd63831e4 (diff) | |
| download | SCons-41327e986275b57ad9ff92d402276ffb318e9e7b.zip SCons-41327e986275b57ad9ff92d402276ffb318e9e7b.tar.gz SCons-41327e986275b57ad9ff92d402276ffb318e9e7b.tar.bz2 | |
Fix various SConf bugs. (Christoph Wiedemann)
Diffstat (limited to 'src/engine/SCons/Script/SConscript.py')
| -rw-r--r-- | src/engine/SCons/Script/SConscript.py | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/engine/SCons/Script/SConscript.py b/src/engine/SCons/Script/SConscript.py index 92cd68d..8212061 100644 --- a/src/engine/SCons/Script/SConscript.py +++ b/src/engine/SCons/Script/SConscript.py @@ -67,6 +67,9 @@ global_exports = {} # chdir flag sconscript_chdir = 1 +# will be set to 1, if we are reading a SConscript +sconscript_reading = 0 + def _scons_add_args(alist): global arguments for arg in alist: @@ -139,6 +142,8 @@ def Return(*vars): stack[-1].retval = tuple(retval) def _SConscript(fs, *files, **kw): + global sconscript_reading + sconscript_reading = 1 top = fs.Top sd = fs.SConstruct_dir.rdir() exports = kw.get('exports', []) @@ -215,6 +220,7 @@ def _SConscript(fs, *files, **kw): f.path) finally: + sconscript_reading = 0 sys.path = old_sys_path frame = stack.pop() try: |