diff options
| author | Dirk Baechle <dl9obn@darc.de> | 2015-08-06 17:14:50 (GMT) |
|---|---|---|
| committer | Dirk Baechle <dl9obn@darc.de> | 2015-08-06 17:14:50 (GMT) |
| commit | f1dbc3edd79cfbc80e469377bf8d45624cc04d40 (patch) | |
| tree | 819103cc2938aec5231da4cd07eac71ea6d90c06 /src/engine/SCons/Script/SConscript.py | |
| parent | 1787f2cb6c75f45c6b0ac7a6c3c9c4b0ea95c5eb (diff) | |
| parent | 2dd443706e2c6a2f85e9ac40a237fc2c73aab345 (diff) | |
| download | SCons-f1dbc3edd79cfbc80e469377bf8d45624cc04d40.zip SCons-f1dbc3edd79cfbc80e469377bf8d45624cc04d40.tar.gz SCons-f1dbc3edd79cfbc80e469377bf8d45624cc04d40.tar.bz2 | |
Merged in dirkbaechle/scons : switch of core classes to slots, memoizer subsystem now uses decorators
Diffstat (limited to 'src/engine/SCons/Script/SConscript.py')
| -rw-r--r-- | src/engine/SCons/Script/SConscript.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/engine/SCons/Script/SConscript.py b/src/engine/SCons/Script/SConscript.py index f4a7f07..0a5720d 100644 --- a/src/engine/SCons/Script/SConscript.py +++ b/src/engine/SCons/Script/SConscript.py @@ -265,7 +265,7 @@ def _SConscript(fs, *files, **kw): call_stack[-1].globals.update({__file__:old_file}) else: SCons.Warnings.warn(SCons.Warnings.MissingSConscriptWarning, - "Ignoring missing SConscript '%s'" % f.path) + "Ignoring missing SConscript '%s'" % f.get_internal_path()) finally: SCons.Script.sconscript_reading = SCons.Script.sconscript_reading - 1 @@ -438,7 +438,7 @@ class SConsEnvironment(SCons.Environment.Base): fname = fn.get_path(src_dir) files = [os.path.join(str(variant_dir), fname)] else: - files = [fn.abspath] + files = [fn.get_abspath()] kw['src_dir'] = variant_dir self.fs.VariantDir(variant_dir, src_dir, duplicate) |