diff options
| -rw-r--r-- | azure-pipelines.yml | 1 | ||||
| -rw-r--r-- | mesonbuild/dependencies/base.py | 5 |
2 files changed, 6 insertions, 0 deletions
diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 23cbda7cb..fa24b32a1 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -82,6 +82,7 @@ jobs: displayName: Install Dependencies - script: | set PATH=%CYGWIN_ROOT%\bin;%SYSTEMROOT%\system32 + cp /usr/bin/python3.5 /usr/bin/python3 env.exe -- python3.5 run_tests.py --backend=ninja displayName: Run Tests - task: CopyFiles@2 diff --git a/mesonbuild/dependencies/base.py b/mesonbuild/dependencies/base.py index f4e47cf5d..ab7ea545d 100644 --- a/mesonbuild/dependencies/base.py +++ b/mesonbuild/dependencies/base.py @@ -1801,6 +1801,11 @@ class ExternalProgram: # Windows does not ship python3.exe, but we know the path to it if len(commands) > 0 and commands[0] == 'python3': commands = mesonlib.python_command + commands[1:] + elif mesonlib.is_cygwin(): + for i in commands: + if 'python3' in i: + commands = mesonlib.python_command + break elif mesonlib.is_haiku(): # Haiku does not have /usr, but a lot of scripts assume that # /usr/bin/env always exists. Detect that case and run the |