Removed local variable

Author: cmaglie

legacy/builder/container_find_includes.go

@@ -331,7 +331,6 @@ func (f *CppIncludesFinder) findIncludesUntilDone(sourceFile SourceFile) error {
 		var include string
 		f.cache.ExpectFile(sourcePath)
 
-		includes := f.ctx.IncludeFolders
 		var preprocErr error
 		var preprocStderr []byte
 		if unchanged && f.cache.valid {
@@ -340,7 +339,7 @@ func (f *CppIncludesFinder) findIncludesUntilDone(sourceFile SourceFile) error {
 				f.ctx.GetLogger().Println(constants.LOG_LEVEL_INFO, constants.MSG_USING_CACHED_INCLUDES, sourcePath)
 			}
 		} else {
-			preprocStderr, preprocErr = GCCPreprocRunnerForDiscoveringIncludes(f.ctx, sourcePath, targetFilePath, includes)
+			preprocStderr, preprocErr = GCCPreprocRunnerForDiscoveringIncludes(f.ctx, sourcePath, targetFilePath, f.ctx.IncludeFolders)
 			// Unwrap error and see if it is an ExitError.
 			_, isExitError := errors.Cause(preprocErr).(*exec.ExitError)
 			if preprocErr == nil {
@@ -372,7 +371,7 @@ func (f *CppIncludesFinder) findIncludesUntilDone(sourceFile SourceFile) error {
 			// return errors.WithStack(err)
 			if preprocErr == nil || preprocStderr == nil {
 				// Filename came from cache, so run preprocessor to obtain error to show
-				preprocStderr, preprocErr = GCCPreprocRunnerForDiscoveringIncludes(f.ctx, sourcePath, targetFilePath, includes)
+				preprocStderr, preprocErr = GCCPreprocRunnerForDiscoveringIncludes(f.ctx, sourcePath, targetFilePath, f.ctx.IncludeFolders)
 				if preprocErr == nil {
 					// If there is a missing #include in the cache, but running
 					// gcc does not reproduce that, there is something wrong.
@@ -392,7 +391,7 @@ func (f *CppIncludesFinder) findIncludesUntilDone(sourceFile SourceFile) error {
 		f.appendIncludeFolder(sourcePath, include, library.SourceDir)
 		if library.UtilityDir != nil {
 			// TODO: Use library.SourceDirs() instead?
-			includes = append(includes, library.UtilityDir)
+			f.ctx.IncludeFolders = append(f.ctx.IncludeFolders, library.UtilityDir)
 		}
 		sourceDirs := library.SourceDirs()
 		for _, sourceDir := range sourceDirs {