diff options
| author | Daniel Moody <daniel.moody@mongodb.com> | 2020-09-16 17:50:06 +0000 |
|---|---|---|
| committer | Evergreen Agent <no-reply@evergreen.mongodb.com> | 2020-09-21 14:49:36 +0000 |
| commit | 9a2d87bdd45c5a89af147308e03121b0e4ef9a83 (patch) | |
| tree | 04cd5fca232d19e95a17ce90ea3289ca1236975e /SConstruct | |
| parent | 8797f3b34d6602db8b44f93e345cec38058508e5 (diff) | |
| download | mongo-9a2d87bdd45c5a89af147308e03121b0e4ef9a83.tar.gz | |
SERVER-50376 Ninja should rebuild on compiler and tool changes
Diffstat (limited to 'SConstruct')
| -rw-r--r-- | SConstruct | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/SConstruct b/SConstruct index d0c9bb90889..cf7bd716727 100644 --- a/SConstruct +++ b/SConstruct @@ -4100,9 +4100,15 @@ if get_option('ninja') != 'disabled': ) def get_idlc_command(env, node, action, targets, sources, executor=None): - _, variables = env.NinjaGetShellCommand(node, action, targets, sources, executor=executor) + if get_option('build-tools') == 'next' or get_option('ninja') == 'next': + _, variables, _ = env.NinjaGetGenericShellCommand(node, action, targets, sources, executor=executor) + else: + _, variables = env.NinjaGetShellCommand(node, action, targets, sources, executor=executor) variables["msvc_deps_prefix"] = "import file:" - return "IDLC", variables + if get_option('build-tools') == 'next' or get_option('ninja') == 'next': + return "IDLC", variables, env.subst(env['IDLC']).split() + else: + return "IDLC", variables env.NinjaRuleMapping("$IDLCCOM", get_idlc_command) env.NinjaRuleMapping(env["IDLCCOM"], get_idlc_command) |