diff options
| author | Brad King <brad.king@kitware.com> | 2022-03-26 12:36:31 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2022-03-26 12:36:31 (GMT) |
| commit | 0906a9b53d914a194464342c4f09764cefba0514 (patch) | |
| tree | 70a027718b56d073ac8b560f914888800f09f138 /Source | |
| parent | 01a4be3c60d02b91ff602cc20c648d881549bc3c (diff) | |
| parent | a8dae21ac1872316dfe77e57c59f8441c3d67ce8 (diff) | |
| download | CMake-0906a9b53d914a194464342c4f09764cefba0514.zip CMake-0906a9b53d914a194464342c4f09764cefba0514.tar.gz CMake-0906a9b53d914a194464342c4f09764cefba0514.tar.bz2 | |
Merge branch 'aix-exe-exports' into release-3.22
Merge-request: !7120
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/cmMakefileExecutableTargetGenerator.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Source/cmMakefileExecutableTargetGenerator.cxx b/Source/cmMakefileExecutableTargetGenerator.cxx index 575fb05..b4f0df0 100644 --- a/Source/cmMakefileExecutableTargetGenerator.cxx +++ b/Source/cmMakefileExecutableTargetGenerator.cxx @@ -195,8 +195,6 @@ void cmMakefileExecutableTargetGenerator::WriteNvidiaDeviceExecutableRule( this->CreateObjectLists(useLinkScript, false, useResponseFileForObjects, buildObjs, depends, useWatcomQuote); - std::string const& aixExports = this->GetAIXExports(this->GetConfigName()); - cmRulePlaceholderExpander::RuleVariables vars; std::string objectDir = this->GeneratorTarget->GetSupportDirectory(); @@ -217,7 +215,6 @@ void cmMakefileExecutableTargetGenerator::WriteNvidiaDeviceExecutableRule( cmOutputConverter::SHELL); vars.Language = linkLanguage.c_str(); - vars.AIXExports = aixExports.c_str(); vars.Objects = buildObjs.c_str(); vars.ObjectDir = objectDir.c_str(); vars.Target = target.c_str(); @@ -527,11 +524,14 @@ void cmMakefileExecutableTargetGenerator::WriteExecutableRule(bool relink) std::string manifests = this->GetManifests(this->GetConfigName()); + std::string const& aixExports = this->GetAIXExports(this->GetConfigName()); + cmRulePlaceholderExpander::RuleVariables vars; vars.CMTargetName = this->GeneratorTarget->GetName().c_str(); vars.CMTargetType = cmState::GetTargetTypeName(this->GeneratorTarget->GetType()).c_str(); vars.Language = linkLanguage.c_str(); + vars.AIXExports = aixExports.c_str(); vars.Objects = buildObjs.c_str(); std::string objectDir = this->GeneratorTarget->GetSupportDirectory(); |