diff options
| author | Daniel Moody <daniel.moody@mongodb.com> | 2021-05-05 10:09:56 -0500 |
|---|---|---|
| committer | Evergreen Agent <no-reply@evergreen.mongodb.com> | 2021-05-05 19:37:13 +0000 |
| commit | 5a36b11b00fd4665cf703f5e67c6efba582cf5ce (patch) | |
| tree | 2d94ffb276a23bc528ad0d6d9d2e7d0770c01738 | |
| parent | 7fec4ca75089c4c30228b8179ef2832081b5c9fa (diff) | |
| download | mongo-5a36b11b00fd4665cf703f5e67c6efba582cf5ce.tar.gz | |
SERVER-56666 fix ninja evergreen default install action
| -rw-r--r-- | etc/evergreen.yml | 8 | ||||
| -rwxr-xr-x | evergreen/scons_compile.sh | 4 |
2 files changed, 10 insertions, 2 deletions
diff --git a/etc/evergreen.yml b/etc/evergreen.yml index 49e9a21edf4..4b53455ef77 100644 --- a/etc/evergreen.yml +++ b/etc/evergreen.yml @@ -2866,6 +2866,9 @@ tasks: commands: - func: "scons compile" vars: + generating_for_ninja: true + task_install_action: + default task_compile_flags: >- --ninja targets: @@ -2893,6 +2896,9 @@ tasks: commands: - func: "scons compile" vars: + generating_for_ninja: true + task_install_action: + default task_compile_flags: >- --build-tools=next --ninja @@ -2939,8 +2945,6 @@ tasks: - func: "scons compile" vars: - task_install_action: - default task_compile_flags: >- --link-model=dynamic --build-tools=next diff --git a/evergreen/scons_compile.sh b/evergreen/scons_compile.sh index 1e2623487a0..b274fdea96c 100755 --- a/evergreen/scons_compile.sh +++ b/evergreen/scons_compile.sh @@ -58,6 +58,10 @@ else extra_args="$extra_args --release" fi +if [ "${generating_for_ninja}" = "true" ] && [ "Windows_NT" = "$OS" ]; then + vcvars="$(vswhere -latest -property installationPath | tr '\\' '/' | dos2unix.exe)/VC/Auxiliary/Build/" + export PATH="$(echo "$(cd "$vcvars" && cmd /C "vcvarsall.bat amd64 && C:/cygwin/bin/bash -c 'echo \$PATH'")" | tail -n +6)":$PATH +fi activate_venv eval ${compile_env} $python ./buildscripts/scons.py \ |