@@ -339,9 +339,9 @@ func findIncludesUntilDone(ctx *types.Context, cache *includeCache, sourceFileQu
339
339
// search path, but only for the source code of the library, so we temporary
340
340
// copy the current search path list and add the library' utility directory
341
341
// if needed.
342
- includes := ctx .IncludeFolders
342
+ includeFolders := ctx .IncludeFolders
343
343
if library := sourceFile .Library ; library != nil && library .UtilityDir != nil {
344
- includes = append (includes , library .UtilityDir )
344
+ includeFolders = append (includeFolders , library .UtilityDir )
345
345
}
346
346
347
347
if library := sourceFile .Library ; library != nil {
@@ -366,7 +366,7 @@ func findIncludesUntilDone(ctx *types.Context, cache *includeCache, sourceFileQu
366
366
}
367
367
} else {
368
368
var preproc_stdout []byte
369
- preproc_stdout , preproc_stderr , preproc_err = preprocessor .GCC (sourcePath , targetFilePath , includes , ctx .BuildProperties )
369
+ preproc_stdout , preproc_stderr , preproc_err = preprocessor .GCC (sourcePath , targetFilePath , includeFolders , ctx .BuildProperties )
370
370
if ctx .Verbose {
371
371
ctx .WriteStdout (preproc_stdout )
372
372
ctx .WriteStdout (preproc_stderr )
@@ -398,7 +398,7 @@ func findIncludesUntilDone(ctx *types.Context, cache *includeCache, sourceFileQu
398
398
if preproc_err == nil || preproc_stderr == nil {
399
399
// Filename came from cache, so run preprocessor to obtain error to show
400
400
var preproc_stdout []byte
401
- preproc_stdout , preproc_stderr , preproc_err = preprocessor .GCC (sourcePath , targetFilePath , includes , ctx .BuildProperties )
401
+ preproc_stdout , preproc_stderr , preproc_err = preprocessor .GCC (sourcePath , targetFilePath , includeFolders , ctx .BuildProperties )
402
402
if ctx .Verbose {
403
403
ctx .WriteStdout (preproc_stdout )
404
404
}
0 commit comments