@@ -345,9 +345,9 @@ func findIncludesUntilDone(ctx *types.Context, cache *includeCache, sourceFileQu
345
345
var include string
346
346
cache .ExpectFile (sourcePath )
347
347
348
- includes := ctx .IncludeFolders
348
+ includeFolders := ctx .IncludeFolders
349
349
if library , ok := sourceFile .Origin .(* libraries.Library ); ok && library .UtilityDir != nil {
350
- includes = append (includes , library .UtilityDir )
350
+ includeFolders = append (includeFolders , library .UtilityDir )
351
351
}
352
352
353
353
if library , ok := sourceFile .Origin .(* libraries.Library ); ok {
@@ -371,7 +371,7 @@ func findIncludesUntilDone(ctx *types.Context, cache *includeCache, sourceFileQu
371
371
}
372
372
} else {
373
373
var preproc_stdout []byte
374
- preproc_stdout , preproc_stderr , preproc_err = preprocessor .GCC (sourcePath , targetFilePath , includes , ctx .BuildProperties )
374
+ preproc_stdout , preproc_stderr , preproc_err = preprocessor .GCC (sourcePath , targetFilePath , includeFolders , ctx .BuildProperties )
375
375
if ctx .Verbose {
376
376
ctx .WriteStdout (preproc_stdout )
377
377
ctx .WriteStdout (preproc_stderr )
@@ -406,7 +406,7 @@ func findIncludesUntilDone(ctx *types.Context, cache *includeCache, sourceFileQu
406
406
if preproc_err == nil || preproc_stderr == nil {
407
407
// Filename came from cache, so run preprocessor to obtain error to show
408
408
var preproc_stdout []byte
409
- preproc_stdout , preproc_stderr , preproc_err = preprocessor .GCC (sourcePath , targetFilePath , includes , ctx .BuildProperties )
409
+ preproc_stdout , preproc_stderr , preproc_err = preprocessor .GCC (sourcePath , targetFilePath , includeFolders , ctx .BuildProperties )
410
410
if ctx .Verbose {
411
411
ctx .WriteStdout (preproc_stdout )
412
412
}
0 commit comments