lix-project/lix
20
57
Fork 31
Code Issues 348 Code Review (Gerrit) Projects 3 Releases Wiki Activity

fix disappearing bash arguments

Browse source
This commit is contained in:
Joel Taylor 2014-08-21 14:06:49 -07:00 committed by Eelco Dolstra
parent 3f80060500
commit b224ac1520
1 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/libstore/build.cc
View file

@ -2133,8 +2133,13 @@ void DerivationGoal::initChild()
/* Fill in the arguments. */ /* Fill in the arguments. */
string builderBasename = baseNameOf(drv.builder); string builderBasename = baseNameOf(drv.builder);
args.push_back(builderBasename.c_str()); args.push_back(builderBasename.c_str());
foreach (Strings::iterator, i, drv.args) foreach (Strings::iterator, i, drv.args) {
args.push_back(rewriteHashes(*i, rewritesToTmp).c_str()); auto re = rewriteHashes(*i, rewritesToTmp);
auto cstr = new char[re.length()+1];
std::strcpy(cstr, re.c_str());
args.push_back(cstr);
}
args.push_back(0); args.push_back(0);
restoreSIGPIPE(); restoreSIGPIPE();