diff options
| author | Alexander Neben <alexander.neben@mongodb.com> | 2022-09-02 20:55:27 +0000 |
|---|---|---|
| committer | Evergreen Agent <no-reply@evergreen.mongodb.com> | 2022-09-02 21:48:46 +0000 |
| commit | 8d21d154677e2202e2a7ddd7f99d2a0ffedf4d53 (patch) | |
| tree | 687b22f87449f32b871673b154a1d9662de9ebd3 | |
| parent | 56fa5811e2173dddfcb25689e15dafc680e9b0a6 (diff) | |
| download | mongo-8d21d154677e2202e2a7ddd7f99d2a0ffedf4d53.tar.gz | |
SERVER-69281 Minimum ninja version
| -rw-r--r-- | etc/pip/components/compile.req | 1 | ||||
| -rw-r--r-- | evergreen/ninja_compile.sh | 3 | ||||
| -rw-r--r-- | site_scons/site_tools/ninja.py | 2 |
3 files changed, 4 insertions, 2 deletions
diff --git a/etc/pip/components/compile.req b/etc/pip/components/compile.req index 1ef0f56a10d..e26295d38b3 100644 --- a/etc/pip/components/compile.req +++ b/etc/pip/components/compile.req @@ -4,3 +4,4 @@ packaging <= 21.3 regex <= 2021.11.10 requirements_parser <= 0.3.1 setuptools +ninja>=1.10.0 diff --git a/evergreen/ninja_compile.sh b/evergreen/ninja_compile.sh index 823944277be..be1da3234de 100644 --- a/evergreen/ninja_compile.sh +++ b/evergreen/ninja_compile.sh @@ -7,7 +7,6 @@ set -o errexit set -o verbose activate_venv -python -m pip install ninja if [ "Windows_NT" = "$OS" ]; then vcvars="$(vswhere -latest -property installationPath | tr '\\' '/' | dos2unix.exe)/VC/Auxiliary/Build/" echo "call \"$vcvars/vcvarsall.bat\" amd64" > msvc.bat @@ -17,5 +16,5 @@ if [ "Windows_NT" = "$OS" ]; then echo "ninja -f ${ninja_file} install-core" >> msvc.bat cmd /C msvc.bat else - eval ${compile_env} ninja -f ${ninja_file} install-core + eval ${compile_env} ninja -f ${ninja_file} install-core compiledb fi diff --git a/site_scons/site_tools/ninja.py b/site_scons/site_tools/ninja.py index be46bd34646..82bd1b86262 100644 --- a/site_scons/site_tools/ninja.py +++ b/site_scons/site_tools/ninja.py @@ -671,6 +671,8 @@ class NinjaState: ninja.comment("Generated by scons. DO NOT EDIT.") + # This version is needed because it is easy to get from pip and it support compile_commands.json + ninja.variable("ninja_required_version", "1.10") ninja.variable("builddir", get_path(self.env['NINJA_BUILDDIR'])) for pool_name, size in self.pools.items(): |