|
|
@@ -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();
|
|
|
|