# HG changeset patch # User David Anderson # Date 1384575305 28800 # Node ID 5cbcf2a49ddf84b95cae67dd8de6607256a97d7e # Parent f8be44aa769aef3ba474b94058e45aa2c5990750 Fix merge bustage. diff -r f8be44aa769a -r 5cbcf2a49ddf ambuild2/frontend/cpp.py --- a/ambuild2/frontend/cpp.py Fri Nov 15 19:56:54 2013 -0800 +++ b/ambuild2/frontend/cpp.py Fri Nov 15 20:15:05 2013 -0800 @@ -385,7 +385,7 @@ self.outputFile = name self.argv = argv if self.linker_.pdbSuffix: - self.pdbFile = self.name_ + self.pdbFile = self.name_ + self.linker_.pdbSuffix else: self.pdbFile = None