diff options
| author | Brad King <brad.king@kitware.com> | 2024-12-03 18:43:37 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2024-12-03 18:48:57 (GMT) |
| commit | 1a04515a474ebfee5e3f457d62d027f7b9323c86 (patch) | |
| tree | 5b60d73425c071c398575347ac72337f388ca7d6 /Source | |
| parent | 50afcb61f7ef81cde2fc6e46f9bd04346f188803 (diff) | |
| download | CMake-1a04515a474ebfee5e3f457d62d027f7b9323c86.zip CMake-1a04515a474ebfee5e3f457d62d027f7b9323c86.tar.gz CMake-1a04515a474ebfee5e3f457d62d027f7b9323c86.tar.bz2 | |
fileapi: Do not expose flags for linker-generated dependencies
In commit 375e6fdbbe (Link step: use linker dependency linker file,
2023-04-19, v3.27.0-rc1~126^2) we added the `-Wl,--dependency-file,...`
flag for the Ninja generator in a code path shared with the file-api.
This flag is a build system implementation detail and should not be
exposed to file-api clients. Move it to a Ninja-specific code path.
Fixes: #26498
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/cmLocalGenerator.cxx | 2 | ||||
| -rw-r--r-- | Source/cmNinjaNormalTargetGenerator.cxx | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/Source/cmLocalGenerator.cxx b/Source/cmLocalGenerator.cxx index 42b517e..f72e4b4 100644 --- a/Source/cmLocalGenerator.cxx +++ b/Source/cmLocalGenerator.cxx @@ -1626,8 +1626,6 @@ void cmLocalGenerator::GetTargetFlags( this->AppendPositionIndependentLinkerFlags(extraLinkFlags, target, config, linkLanguage); this->AppendIPOLinkerFlags(extraLinkFlags, target, config, linkLanguage); - this->AppendDependencyInfoLinkerFlags(extraLinkFlags, target, config, - linkLanguage); this->AppendModuleDefinitionFlag(extraLinkFlags, target, linkLineComputer, config); diff --git a/Source/cmNinjaNormalTargetGenerator.cxx b/Source/cmNinjaNormalTargetGenerator.cxx index 891187a..6535371 100644 --- a/Source/cmNinjaNormalTargetGenerator.cxx +++ b/Source/cmNinjaNormalTargetGenerator.cxx @@ -1277,6 +1277,9 @@ void cmNinjaNormalTargetGenerator::WriteLinkStatement( vars["LINK_LIBRARIES"], vars["FLAGS"], vars["LINK_FLAGS"], frameworkPath, linkPath, gt); + localGen.AppendDependencyInfoLinkerFlags(vars["LINK_FLAGS"], gt, config, + this->TargetLinkLanguage(config)); + // Add OS X version flags, if any. if (this->GeneratorTarget->GetType() == cmStateEnums::SHARED_LIBRARY || this->GeneratorTarget->GetType() == cmStateEnums::MODULE_LIBRARY) { |