diff options
Diffstat (limited to 'mesonbuild')
| -rw-r--r-- | mesonbuild/compilers/detect.py | 2 | ||||
| -rw-r--r-- | mesonbuild/interpreter/interpreter.py | 2 | ||||
| -rwxr-xr-x | mesonbuild/msubprojects.py | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/mesonbuild/compilers/detect.py b/mesonbuild/compilers/detect.py index f347a63..1c91a33 100644 --- a/mesonbuild/compilers/detect.py +++ b/mesonbuild/compilers/detect.py @@ -392,7 +392,7 @@ def _detect_c_or_cpp_compiler(env: 'Environment', lang: str, for_machine: Machin watcom_cls = [sanitize(os.path.join(os.environ['WATCOM'], 'BINNT', 'cl')), sanitize(os.path.join(os.environ['WATCOM'], 'BINNT', 'cl.exe')), sanitize(os.path.join(os.environ['WATCOM'], 'BINNT64', 'cl')), - sanitize(os.path.join(os.environ['WATCOM'], 'BINNT64', 'cl.exe')),] + sanitize(os.path.join(os.environ['WATCOM'], 'BINNT64', 'cl.exe'))] found_cl = sanitize(shutil.which('cl')) if found_cl in watcom_cls: mlog.debug('Skipping unsupported cl.exe clone at:', found_cl) diff --git a/mesonbuild/interpreter/interpreter.py b/mesonbuild/interpreter/interpreter.py index 63da021..136e596 100644 --- a/mesonbuild/interpreter/interpreter.py +++ b/mesonbuild/interpreter/interpreter.py @@ -1706,7 +1706,7 @@ external dependencies (including libraries) must go to "dependencies".''') kwargs['output'][0], self.subdir, self.subproject, - self.environment.get_build_command() + \ + self.environment.get_build_command() + ['--internal', 'vcstagger', '@INPUT0@', diff --git a/mesonbuild/msubprojects.py b/mesonbuild/msubprojects.py index 4eb3632..9e9af2a 100755 --- a/mesonbuild/msubprojects.py +++ b/mesonbuild/msubprojects.py @@ -586,7 +586,7 @@ def add_arguments(parser: argparse.ArgumentParser) -> None: p = subparsers.add_parser('update', help='Update all subprojects from wrap files') p.add_argument('--rebase', default=True, action='store_true', - help='Rebase your branch on top of wrap\'s revision. ' + \ + help='Rebase your branch on top of wrap\'s revision. ' + 'Deprecated, it is now the default behaviour. (git only)') p.add_argument('--reset', default=False, action='store_true', help='Checkout wrap\'s revision and hard reset to that commit. (git only)') |