diff options
author | Brad King <brad.king@kitware.com> | 2020-11-10 20:10:05 (GMT) |
---|---|---|
committer | Brad King <brad.king@kitware.com> | 2020-11-10 20:16:28 (GMT) |
commit | c5011399c59a1a004d19a36a58420939fd6b8670 (patch) | |
tree | 39809d80f45cb54a62a8e1b47b4fea5a48567b98 /Source/cmGlobalNinjaGenerator.cxx | |
parent | 7a04f45722b2cbe51e1586cd84d2c5ad90e759ed (diff) | |
download | CMake-c5011399c59a1a004d19a36a58420939fd6b8670.zip CMake-c5011399c59a1a004d19a36a58420939fd6b8670.tar.gz CMake-c5011399c59a1a004d19a36a58420939fd6b8670.tar.bz2 |
Ninja: Avoid cleandead with dyndep bindings for Fortran module dependencies
The Ninja `cleandead` tool does not account for implicit outputs
discovered by `dyndep` bindings and can remove Fortran `.mod` files that
are still needed. Disable the `cleandead` step when using `dyndep`
bindings.
Fixes: #21406
Diffstat (limited to 'Source/cmGlobalNinjaGenerator.cxx')
-rw-r--r-- | Source/cmGlobalNinjaGenerator.cxx | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/Source/cmGlobalNinjaGenerator.cxx b/Source/cmGlobalNinjaGenerator.cxx index 8c194fd..cf45da9 100644 --- a/Source/cmGlobalNinjaGenerator.cxx +++ b/Source/cmGlobalNinjaGenerator.cxx @@ -240,6 +240,12 @@ void cmGlobalNinjaGenerator::WriteBuild(std::ostream& os, } } + if (build.Variables.count("dyndep") > 0) { + // The ninja 'cleandead' operation does not account for outputs + // discovered by 'dyndep' bindings. Avoid removing them. + this->DisableCleandead = true; + } + os << buildStr << arguments << assignments << "\n"; } @@ -501,6 +507,7 @@ void cmGlobalNinjaGenerator::Generate() this->InitOutputPathPrefix(); this->TargetAll = this->NinjaOutputPath("all"); this->CMakeCacheFile = this->NinjaOutputPath("CMakeCache.txt"); + this->DisableCleandead = false; this->PolicyCMP0058 = this->LocalGenerators[0]->GetMakefile()->GetPolicyStatus( @@ -581,8 +588,8 @@ void cmGlobalNinjaGenerator::CleanMetaData() // wrote out. Ninja-Multi doesn't have a single `build.ninja` we can use that // is the union of all generated configurations, so we can't run it reliably // in that case. - if (this->NinjaSupportsCleanDeadTool && expectBuildManifest && - !missingBuildManifest) { + if (this->NinjaSupportsCleanDeadTool && !this->DisableCleandead && + expectBuildManifest && !missingBuildManifest) { run_ninja_tool({ "cleandead" }); } // The `recompact` tool loads the manifest. As above, we don't have a single |