Skip to content

Commit 39468e7

Browse files
committed
Rename variable 'includes' -> 'includeFolders'
1 parent c055ed1 commit 39468e7

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
@@ -336,9 +336,9 @@ func findIncludesUntilDone(ctx *types.Context, cache *includeCache, sourceFile *
336336
// search path, but only for the source code of the library, so we temporary
337337
// copy the current search path list and add the library' utility directory
338338
// if needed.
339-
includes := ctx.IncludeFolders
339+
includeFolders := ctx.IncludeFolders
340340
if library := sourceFile.Library; library != nil && library.UtilityDir != nil {
341-
includes = append(includes, library.UtilityDir)
341+
includeFolders = append(includeFolders, library.UtilityDir)
342342
}
343343

344344
if library := sourceFile.Library; library != nil {
@@ -362,7 +362,7 @@ func findIncludesUntilDone(ctx *types.Context, cache *includeCache, sourceFile *
362362
ctx.Info(tr("Using cached library dependencies for file: %[1]s", sourcePath))
363363
}
364364
} else {
365-
preproc_stderr, preproc_err = GCCPreprocRunnerForDiscoveringIncludes(ctx, sourcePath, targetFilePath, includes)
365+
preproc_stderr, preproc_err = GCCPreprocRunnerForDiscoveringIncludes(ctx, sourcePath, targetFilePath, includeFolders)
366366
// Unwrap error and see if it is an ExitError.
367367
if preproc_err == nil {
368368
// Preprocessor successful, done
@@ -391,7 +391,7 @@ func findIncludesUntilDone(ctx *types.Context, cache *includeCache, sourceFile *
391391
// return errors.WithStack(err)
392392
if preproc_err == nil || preproc_stderr == nil {
393393
// Filename came from cache, so run preprocessor to obtain error to show
394-
preproc_stderr, preproc_err = GCCPreprocRunnerForDiscoveringIncludes(ctx, sourcePath, targetFilePath, includes)
394+
preproc_stderr, preproc_err = GCCPreprocRunnerForDiscoveringIncludes(ctx, sourcePath, targetFilePath, includeFolders)
395395
if preproc_err == nil {
396396
// If there is a missing #include in the cache, but running
397397
// gcc does not reproduce that, there is something wrong.

0 commit comments

Comments
 (0)