diff options
| author | Egor Tensin <Egor.Tensin@gmail.com> | 2020-01-08 19:25:42 +0300 |
|---|---|---|
| committer | Egor Tensin <Egor.Tensin@gmail.com> | 2020-01-08 19:25:42 +0300 |
| commit | 7309d2a3c776d764480e92567581c9cbce37edbc (patch) | |
| tree | dfd38af6efe28ef1a534e10b43b2704e7daa84d6 | |
| parent | common.cmake: CC_STATIC_RUNTIME=OFF implied if using dynamic Boost libs (diff) | |
| download | cmake-common-7309d2a3c776d764480e92567581c9cbce37edbc.tar.gz cmake-common-7309d2a3c776d764480e92567581c9cbce37edbc.zip | |
fix PyLint-discovered bugs
Diffstat (limited to '')
| -rwxr-xr-x | boost/build/build.py | 5 | ||||
| -rwxr-xr-x | boost/build/ci/travis.py | 2 | ||||
| -rwxr-xr-x | cmake/build/build.py | 1 |
3 files changed, 3 insertions, 5 deletions
diff --git a/boost/build/build.py b/boost/build/build.py index 59f6f07..bfb204b 100755 --- a/boost/build/build.py +++ b/boost/build/build.py @@ -375,7 +375,7 @@ class BuildParameters: params.append(self._build_dir(build_dir)) params.append(self._stagedir(platform, configuration)) params.append(self._link(link)) - params.append(self._runtime_link(link)) + params.append(self._runtime_link(runtime_link)) params.append(self._address_model(platform)) params.append(self._variant(configuration)) params += self.b2_args @@ -388,8 +388,7 @@ class BuildParameters: def _stagedir(self, platform, configuration): if _on_windows(): return self._windows_stagedir(platform) - else: - return self._unix_stagedir(platform, configuration) + return self._unix_stagedir(platform, configuration) def _windows_stagedir(self, platform): platform = str(platform) diff --git a/boost/build/ci/travis.py b/boost/build/ci/travis.py index 1c65cc9..4b06281 100755 --- a/boost/build/ci/travis.py +++ b/boost/build/ci/travis.py @@ -89,7 +89,7 @@ def build_travis(argv=None): travis_argv.append('--link') travis_argv += args.link if args.runtime_link is not None: - appveyor_argv += ['--runtime-link', args.runtime_link] + travis_argv += ['--runtime-link', args.runtime_link] travis_argv += [ '--', version.dir_path(_get_build_dir()), ] diff --git a/cmake/build/build.py b/cmake/build/build.py index d0517ba..c4af4ea 100755 --- a/cmake/build/build.py +++ b/cmake/build/build.py @@ -16,7 +16,6 @@ import logging from enum import Enum import os import os.path -import shutil import subprocess import sys import tempfile |