diff options
| author | Dirk Baechle <dl9obn@darc.de> | 2015-08-06 21:50:31 (GMT) |
|---|---|---|
| committer | Dirk Baechle <dl9obn@darc.de> | 2015-08-06 21:50:31 (GMT) |
| commit | d152e4ce442ae724084c9304c9e36e882fa5850d (patch) | |
| tree | 4a4d0d6b99d47221bcab4166c90adbf041de07e1 /src | |
| parent | f1dbc3edd79cfbc80e469377bf8d45624cc04d40 (diff) | |
| download | SCons-d152e4ce442ae724084c9304c9e36e882fa5850d.zip SCons-d152e4ce442ae724084c9304c9e36e882fa5850d.tar.gz SCons-d152e4ce442ae724084c9304c9e36e882fa5850d.tar.bz2 | |
- fixed several tests and tools that still used Node attributes directly
(found by disabling the __getattr__ in Node/FS.py)
Diffstat (limited to 'src')
| -rw-r--r-- | src/engine/SCons/Tool/link.py | 2 | ||||
| -rw-r--r-- | src/engine/SCons/Tool/msvs.py | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/engine/SCons/Tool/link.py b/src/engine/SCons/Tool/link.py index 2624946..a084bc4 100644 --- a/src/engine/SCons/Tool/link.py +++ b/src/engine/SCons/Tool/link.py @@ -86,7 +86,7 @@ def shlib_emitter(target, source, env): # the version number target[0].attributes.shlibname = version_names[0] shlib = env.File(version_names[0], directory=target[0].get_dir()) - target[0].attributes.shlibpath = shlib.path + target[0].attributes.shlibpath = shlib.get_internal_path() for name in version_names[1:]: env.SideEffect(name, shlib) env.Clean(shlib, name) diff --git a/src/engine/SCons/Tool/msvs.py b/src/engine/SCons/Tool/msvs.py index 8b74cf4..355eeed 100644 --- a/src/engine/SCons/Tool/msvs.py +++ b/src/engine/SCons/Tool/msvs.py @@ -1983,7 +1983,7 @@ def generate(env): env['MSVSSCONSCRIPT'] = default_MSVS_SConscript env['MSVSSCONS'] = '"%s" -c "%s"' % (python_executable, getExecScriptMain(env)) - env['MSVSSCONSFLAGS'] = '-C "${MSVSSCONSCRIPT.dir.abspath}" -f ${MSVSSCONSCRIPT.name}' + env['MSVSSCONSFLAGS'] = '-C "${MSVSSCONSCRIPT.dir.get_abspath()}" -f ${MSVSSCONSCRIPT.name}' env['MSVSSCONSCOM'] = '$MSVSSCONS $MSVSSCONSFLAGS' env['MSVSBUILDCOM'] = '$MSVSSCONSCOM "$MSVSBUILDTARGET"' env['MSVSREBUILDCOM'] = '$MSVSSCONSCOM "$MSVSBUILDTARGET"' |