diff options
| author | Brad King <brad.king@kitware.com> | 2023-03-02 14:53:42 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2023-03-02 14:54:03 (GMT) |
| commit | f9888e5f51429874eaacb9a6e1ee13a95225253f (patch) | |
| tree | 240bd58c9d45eb4a5bdd8d0bd19f1df2cdf8bcbc /Source/cmMakefileLibraryTargetGenerator.cxx | |
| parent | 1d7fb317784ba676800411b2a45b5206e14d426e (diff) | |
| parent | c5305cf493a442f0a3fdc2f987343db48d9e3330 (diff) | |
| download | CMake-f9888e5f51429874eaacb9a6e1ee13a95225253f.zip CMake-f9888e5f51429874eaacb9a6e1ee13a95225253f.tar.gz CMake-f9888e5f51429874eaacb9a6e1ee13a95225253f.tar.bz2 | |
Merge topic 'dont_use_bom_with_cuda'
c5305cf493 Makefile: Don't pass the CUDA compiler response files with UTF8_BOM
Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Ivan Katalenić <ivankatalenic100@gmail.com>
Merge-request: !8267
Diffstat (limited to 'Source/cmMakefileLibraryTargetGenerator.cxx')
| -rw-r--r-- | Source/cmMakefileLibraryTargetGenerator.cxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Source/cmMakefileLibraryTargetGenerator.cxx b/Source/cmMakefileLibraryTargetGenerator.cxx index c8d589d..3e4a08e 100644 --- a/Source/cmMakefileLibraryTargetGenerator.cxx +++ b/Source/cmMakefileLibraryTargetGenerator.cxx @@ -327,14 +327,14 @@ void cmMakefileLibraryTargetGenerator::WriteNvidiaDeviceLibraryRules( this->CreateLinkLibs( linkLineComputer.get(), linkLibs, useResponseFileForLibs, depends, - cmMakefileTargetGenerator::ResponseFlagFor::DeviceLink); + linkLanguage, cmMakefileTargetGenerator::ResponseFlagFor::DeviceLink); // Construct object file lists that may be needed to expand the // rule. std::string buildObjs; this->CreateObjectLists( useLinkScript, false, // useArchiveRules - useResponseFileForObjects, buildObjs, depends, false, + useResponseFileForObjects, buildObjs, depends, false, linkLanguage, cmMakefileTargetGenerator::ResponseFlagFor::DeviceLink); std::string objectDir = this->GeneratorTarget->GetSupportDirectory(); @@ -712,7 +712,7 @@ void cmMakefileLibraryTargetGenerator::WriteLibraryRules( linkLineComputer->SetRelink(relink); this->CreateLinkLibs(linkLineComputer.get(), linkLibs, - useResponseFileForLibs, depends); + useResponseFileForLibs, depends, linkLanguage); } // Construct object file lists that may be needed to expand the @@ -720,7 +720,7 @@ void cmMakefileLibraryTargetGenerator::WriteLibraryRules( std::string buildObjs; this->CreateObjectLists(useLinkScript, useArchiveRules, useResponseFileForObjects, buildObjs, depends, - useWatcomQuote); + useWatcomQuote, linkLanguage); if (!this->DeviceLinkObject.empty()) { buildObjs += " " + this->LocalGenerator->ConvertToOutputFormat( |