Skip to content

Commit a2b03ae

Browse files
committed
Rename variable 'includes' -> 'includeFolders'
1 parent e57d183 commit a2b03ae

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

legacy/builder/container_find_includes.go

+4-4
Original file line numberDiff line numberDiff line change
@@ -339,9 +339,9 @@ func findIncludesUntilDone(ctx *types.Context, cache *includeCache, sourceFileQu
339339
// search path, but only for the source code of the library, so we temporary
340340
// copy the current search path list and add the library' utility directory
341341
// if needed.
342-
includes := ctx.IncludeFolders
342+
includeFolders := ctx.IncludeFolders
343343
if library := sourceFile.Library; library != nil && library.UtilityDir != nil {
344-
includes = append(includes, library.UtilityDir)
344+
includeFolders = append(includeFolders, library.UtilityDir)
345345
}
346346

347347
if library := sourceFile.Library; library != nil {
@@ -366,7 +366,7 @@ func findIncludesUntilDone(ctx *types.Context, cache *includeCache, sourceFileQu
366366
}
367367
} else {
368368
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)
370370
if ctx.Verbose {
371371
ctx.WriteStdout(preproc_stdout)
372372
ctx.WriteStdout(preproc_stderr)
@@ -398,7 +398,7 @@ func findIncludesUntilDone(ctx *types.Context, cache *includeCache, sourceFileQu
398398
if preproc_err == nil || preproc_stderr == nil {
399399
// Filename came from cache, so run preprocessor to obtain error to show
400400
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)
402402
if ctx.Verbose {
403403
ctx.WriteStdout(preproc_stdout)
404404
}

0 commit comments

Comments
 (0)