summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStephen Kelly <steveire@gmail.com>2016-10-08 10:21:37 (GMT)
committerStephen Kelly <steveire@gmail.com>2016-10-10 18:38:55 (GMT)
commitff8e321c6ade784b3f1b3b19a7783788872e44a9 (patch)
tree370ceb92409de09604c7ca98f372f42f88348160
parent80f57e67eefc905a726f2f35bd1672a188ea4c99 (diff)
downloadCMake-ff8e321c6ade784b3f1b3b19a7783788872e44a9.zip
CMake-ff8e321c6ade784b3f1b3b19a7783788872e44a9.tar.gz
CMake-ff8e321c6ade784b3f1b3b19a7783788872e44a9.tar.bz2
cmLocalGenerator: Separate stdlib content from library stream
-rw-r--r--Source/cmLocalGenerator.cxx6
1 files changed, 5 insertions, 1 deletions
diff --git a/Source/cmLocalGenerator.cxx b/Source/cmLocalGenerator.cxx
index 6de8f9a..9e32fd3 100644
--- a/Source/cmLocalGenerator.cxx
+++ b/Source/cmLocalGenerator.cxx
@@ -1506,8 +1506,12 @@ void cmLocalGenerator::OutputLinkLibraries(
std::string standardLibsVar = "CMAKE_";
standardLibsVar += cli.GetLinkLanguage();
standardLibsVar += "_STANDARD_LIBRARIES";
+ std::string stdLibString;
if (const char* stdLibs = this->Makefile->GetDefinition(standardLibsVar)) {
- fout << stdLibs << " ";
+ stdLibString = stdLibs;
+ }
+ if (!stdLibString.empty()) {
+ fout << stdLibString << " ";
}
linkLibraries = fout.str();