From 763a3efc818a57eb034a75c37300df0b8ea3eabc Mon Sep 17 00:00:00 2001 From: Tausif Rahman Date: Fri, 26 Aug 2022 13:56:34 +0000 Subject: SERVER-68003 Make experiment_unified_ninja.vars the default (cherry picked from commit 41d0a45aaf90b8e4e9a91f13a72e5623ecd963c4) (cherry picked from commit 6e2d63630ee90db15b7b122aba1b8c538357a0df) --- evergreen/ninja_compile.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'evergreen') diff --git a/evergreen/ninja_compile.sh b/evergreen/ninja_compile.sh index f3b51ae5e1d..823944277be 100644 --- a/evergreen/ninja_compile.sh +++ b/evergreen/ninja_compile.sh @@ -5,6 +5,7 @@ cd src set -o errexit set -o verbose + activate_venv python -m pip install ninja if [ "Windows_NT" = "$OS" ]; then @@ -13,8 +14,8 @@ if [ "Windows_NT" = "$OS" ]; then for i in "${compile_env[@]}"; do echo "set $i" >> msvc.bat done - echo "ninja install-core" >> msvc.bat + echo "ninja -f ${ninja_file} install-core" >> msvc.bat cmd /C msvc.bat else - eval ${compile_env} ninja install-core + eval ${compile_env} ninja -f ${ninja_file} install-core fi -- cgit v1.2.1