diff options
| author | Daniel Moody <daniel.moody@mongodb.com> | 2020-10-05 20:37:56 +0000 |
|---|---|---|
| committer | Evergreen Agent <no-reply@evergreen.mongodb.com> | 2020-10-26 20:04:53 +0000 |
| commit | 4e93e490d4de7c50871cfd80864817fe389ae718 (patch) | |
| tree | c5ea20e20964a078f6c1d2a9f323b4016801bb20 /site_scons | |
| parent | 91d6d5340979267ccb3c4fe6f68a403e0cdc9c62 (diff) | |
| download | mongo-4e93e490d4de7c50871cfd80864817fe389ae718.tar.gz | |
SERVER-51194 Added build-tools next evergreen tasks
Diffstat (limited to 'site_scons')
| -rw-r--r-- | site_scons/libdeps_next.py | 2 | ||||
| -rw-r--r-- | site_scons/site_tools/next/ninja.py | 11 |
2 files changed, 11 insertions, 2 deletions
diff --git a/site_scons/libdeps_next.py b/site_scons/libdeps_next.py index 51a8376ab3c..5206eb83b8a 100644 --- a/site_scons/libdeps_next.py +++ b/site_scons/libdeps_next.py @@ -1099,7 +1099,7 @@ def setup_environment(env, emitting_shared=False, linting='on', sanitize_typeinf ) env.Prepend(_LIBFLAGS="$_LIBDEPS_TAGS $_LIBDEPS $_SYSLIBDEPS ") - env.Prepend(ARFLAGS="$_LIBDEPS_TAGS ") + env.Prepend(ARFLAGS="$_LIBDEPS_TAGS") for builder_name in ("Program", "SharedLibrary", "LoadableModule", "SharedArchive"): try: update_scanner(env["BUILDERS"][builder_name]) diff --git a/site_scons/site_tools/next/ninja.py b/site_scons/site_tools/next/ninja.py index 17254013914..46a80d3369a 100644 --- a/site_scons/site_tools/next/ninja.py +++ b/site_scons/site_tools/next/ninja.py @@ -1102,9 +1102,18 @@ def get_command(env, node, action): # pylint: disable=too-many-branches implicit.append(provider_dep) continue + # in some case the tool could be in the local directory and be suppled without the ext + # such as in windows, so append the executable suffix and check. + prog_suffix = sub_env.get('PROGSUFFIX', '') + provider_dep_ext = provider_dep if provider_dep.endswith(prog_suffix) else provider_dep + prog_suffix + if os.path.exists(provider_dep_ext): + implicit.append(provider_dep_ext) + continue + # Many commands will assume the binary is in the path, so # we accept this as a possible input from a given command. - provider_dep_abspath = sub_env.WhereIs(provider_dep) + + provider_dep_abspath = sub_env.WhereIs(provider_dep) or sub_env.WhereIs(provider_dep, path=os.environ["PATH"]) if provider_dep_abspath: implicit.append(provider_dep_abspath) continue |