BUG: When there are no link flags, we want an empty string, not a null pointer.
This commit is contained in:
parent
b290e5282c
commit
c8694bb509
@ -1000,12 +1000,19 @@ void cmLocalUnixMakefileGenerator::OutputStaticLibraryRule(std::ostream& fout,
|
|||||||
{
|
{
|
||||||
targetSuffix = this->GetSafeDefinition("CMAKE_STATIC_LIBRARY_SUFFIX");
|
targetSuffix = this->GetSafeDefinition("CMAKE_STATIC_LIBRARY_SUFFIX");
|
||||||
}
|
}
|
||||||
|
std::string linkFlags;
|
||||||
|
const char* targetLinkFlags = t.GetProperty("LINK_FLAGS");
|
||||||
|
if(targetLinkFlags)
|
||||||
|
{
|
||||||
|
linkFlags += targetLinkFlags;
|
||||||
|
linkFlags += " ";
|
||||||
|
}
|
||||||
this->OutputLibraryRule(fout, name, t,
|
this->OutputLibraryRule(fout, name, t,
|
||||||
targetPrefix,
|
targetPrefix,
|
||||||
targetSuffix,
|
targetSuffix,
|
||||||
createRule,
|
createRule,
|
||||||
"static library",
|
"static library",
|
||||||
t.GetProperty("LINK_FLAGS"));
|
linkFlags.c_str());
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user