diff options
author | Brad King <brad.king@kitware.com> | 2022-03-26 12:36:17 (GMT) |
---|---|---|
committer | Brad King <brad.king@kitware.com> | 2022-03-26 12:36:17 (GMT) |
commit | 024204fe0daef9b17e22d02f6fb3d465dac912b6 (patch) | |
tree | bb45e57b080be84214a27b31728bb64872fd0085 | |
parent | f71e89ae423ad5168509d252e79f460026400768 (diff) | |
parent | a8dae21ac1872316dfe77e57c59f8441c3d67ce8 (diff) | |
download | CMake-024204fe0daef9b17e22d02f6fb3d465dac912b6.zip CMake-024204fe0daef9b17e22d02f6fb3d465dac912b6.tar.gz CMake-024204fe0daef9b17e22d02f6fb3d465dac912b6.tar.bz2 |
Merge branch 'aix-exe-exports' into release-3.21
Merge-request: !7120
-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 3a2744e..e7e4a2b 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(); @@ -528,11 +525,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(); |