Skip to content

Commit e938d7e

Browse files
committed
Rename variable 'includes' -> 'includeFolders'
1 parent 00194d2 commit e938d7e

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

legacy/builder/container_find_includes.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -345,9 +345,9 @@ func findIncludesUntilDone(ctx *types.Context, cache *includeCache, sourceFileQu
345345
var include string
346346
cache.ExpectFile(sourcePath)
347347

348-
includes := ctx.IncludeFolders
348+
includeFolders := ctx.IncludeFolders
349349
if library, ok := sourceFile.Origin.(*libraries.Library); ok && library.UtilityDir != nil {
350-
includes = append(includes, library.UtilityDir)
350+
includeFolders = append(includeFolders, library.UtilityDir)
351351
}
352352

353353
if library, ok := sourceFile.Origin.(*libraries.Library); ok {
@@ -371,7 +371,7 @@ func findIncludesUntilDone(ctx *types.Context, cache *includeCache, sourceFileQu
371371
}
372372
} else {
373373
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)
375375
if ctx.Verbose {
376376
ctx.WriteStdout(preproc_stdout)
377377
ctx.WriteStdout(preproc_stderr)
@@ -406,7 +406,7 @@ func findIncludesUntilDone(ctx *types.Context, cache *includeCache, sourceFileQu
406406
if preproc_err == nil || preproc_stderr == nil {
407407
// Filename came from cache, so run preprocessor to obtain error to show
408408
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)
410410
if ctx.Verbose {
411411
ctx.WriteStdout(preproc_stdout)
412412
}

0 commit comments

Comments
 (0)