Commit 5985bf8

facchinmcmaglie

authored and

committed

Don't bail out if got include unrelated error while preprocessing

Preprocessing is a bit tricky, since it expects an error to resolve missing includes; to do this, it invokes gcc with -CC flag (https://gcc.gnu.org/onlinedocs/gcc-4.4.0/gcc/Preprocessor-Options.html#Preprocessor-Options) to expand macro AND comments. Since this flag is not used during normal compilation, the errors reported are mostly bogus. This patch avoids writing the actual (non-include) error on stdout so the compilation can go on and fail on the proper errors (if there's any)

1 parent f3748a5 commit 5985bf8Copy full SHA for 5985bf8

File tree

1 file changed

-5

lines changed

container_find_includes.go

1 file changed

-5

lines changed

`‎container_find_includes.go‎`

Lines changed: 0 additions & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -343,11 +343,6 @@ func findIncludesUntilDone(ctx types.Context, cache includeCache, sourceFile t`
`343`	`343`	`return i18n.WrapError(preproc_err)`
`344`	`344`	`} else {`
`345`	`345`	`include = IncludesFinderWithRegExp(ctx, string(preproc_stderr))`
`346`		`- if include == "" {`
`347`		`- // No include found? Bail out.`
`348`		`- os.Stderr.Write(preproc_stderr)`
`349`		`- return i18n.WrapError(preproc_err)`
`350`		`- }`
`351`	`346`	`}`
`352`	`347`	`}`
`353`	`348`

0 commit comments

Comments

(0)

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Uh oh!

Commit 5985bf8

File tree

1 file changed

1 file changed

`‎container_find_includes.go‎`

0 commit comments