From 1a04515a474ebfee5e3f457d62d027f7b9323c86 Mon Sep 17 00:00:00 2001 From: Brad King Date: Tue, 3 Dec 2024 13:43:37 -0500 Subject: [PATCH] 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 --- Source/cmLocalGenerator.cxx | 2 -- Source/cmNinjaNormalTargetGenerator.cxx | 3 +++ 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/Source/cmLocalGenerator.cxx b/Source/cmLocalGenerator.cxx index 42b517e58a..f72e4b42e6 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 891187a890..65353718d4 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) {