summaryrefslogtreecommitdiffstats
path: root/Source
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2014-10-07 18:12:20 (GMT)
committerCMake Topic Stage <kwrobot@kitware.com>2014-10-07 18:12:20 (GMT)
commit36c7f6620687752a2143f69688b0df3c9f7217f7 (patch)
treeb549a52b1a994e1648786c818f70e9155a32be73 /Source
parent68abbdbd8af8457f30697ccbb2ace595b1ad5802 (diff)
parent71da30cae09d56a81fe43b8c65b9dfeea1d7dd06 (diff)
downloadCMake-36c7f6620687752a2143f69688b0df3c9f7217f7.zip
CMake-36c7f6620687752a2143f69688b0df3c9f7217f7.tar.gz
CMake-36c7f6620687752a2143f69688b0df3c9f7217f7.tar.bz2
Merge topic 'fix-ninja-rsp-var-duplication'
71da30ca Ninja: Fix variable duplication in RSP rules
Diffstat (limited to 'Source')
-rw-r--r--Source/cmGlobalNinjaGenerator.cxx2
1 files changed, 1 insertions, 1 deletions
diff --git a/Source/cmGlobalNinjaGenerator.cxx b/Source/cmGlobalNinjaGenerator.cxx
index 543ecdb..f391203 100644
--- a/Source/cmGlobalNinjaGenerator.cxx
+++ b/Source/cmGlobalNinjaGenerator.cxx
@@ -205,7 +205,7 @@ void cmGlobalNinjaGenerator::WriteBuild(std::ostream& os,
&& args.size() + buildstr.size() + assignments.size()
> (size_t) cmdLineLimit) {
buildstr += "_RSP_FILE";
- variable_assignments.clear();
+ variable_assignments.str(std::string());
cmGlobalNinjaGenerator::WriteVariable(variable_assignments,
"RSP_FILE", rspfile, "", 1);
assignments += variable_assignments.str();