X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fbuilder.cpp;h=e4f7e580f9a1b15fdf2a52eba51d777884f54099;hb=bdc8b6638b486aa668b4a9c6c5cce5f6b5f18222;hp=aabfc00f3908213795ad2fd2a73fb67e6b4dbbb1;hpb=0f5283a54fd188072eca23fbd980a43c6c869913;p=builder.git diff --git a/source/builder.cpp b/source/builder.cpp index aabfc00..e4f7e58 100644 --- a/source/builder.cpp +++ b/source/builder.cpp @@ -285,8 +285,7 @@ Target *Builder::get_library(const string &lib, const list &path, LibMod for(list::const_iterator i=path.begin(); i!=path.end(); ++i) update_hash(hash, *i); - //XXX Incorporate mode into id - string id=hash+lib; + string id=hash+string(1, mode)+lib; TargetMap::iterator i=libraries.find(id); if(i!=libraries.end()) return i->second; @@ -781,7 +780,7 @@ int Builder::do_clean() for(set::iterator i=clean_tgts.begin(); i!=clean_tgts.end(); ++i) { Action *action=new Unlink(*this, **i); - while(action->check()<0); + while(action->check()<0) ; delete action; }