Commit 8b73eee

committed

Handle multi-threaded compile streams

1 parent 816a681 commit 8b73eeeCopy full SHA for 8b73eee

File tree

-1

lines changed

-1

lines changed

Lines changed: 9 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -190,7 +190,15 @@ func compileFileWithRecipe(ctx types.Context, sourcePath paths.Path, source *p`
`190`	`190`	`ctx.CompilationDatabase.Add(source, command)`
`191`	`191`	`}`
`192`	`192`	`if !objIsUpToDate && !ctx.OnlyUpdateCompilationDatabase {`
`193`		`- _, _, err = utils.ExecCommand(ctx, command, utils.ShowIfVerbose /* stdout /, utils.Show / stderr */)`
	`193`	`+ // Since this compile could be multithreaded, we first capture the command output`
	`194`	`+ stdout, stderr, err := utils.ExecCommand(ctx, command, utils.Capture, utils.Capture)`
	`195`	`+ // and transfer all at once at the end...`
	`196`	`+ if ctx.Verbose {`
	`197`	`+ ctx.WriteStdout(stdout)`
	`198`	`+ }`
	`199`	`+ ctx.WriteStderr(stderr)`
	`200`	`+`
	`201`	`+ // ...and then return the error`
`194`	`202`	`if err != nil {`
`195`	`203`	`return nil, errors.WithStack(err)`
`196`	`204`	`}`

Comments

(0)