Library discovery: add additional include paths after discovering the library

Author: facchinm

legacy/builder/container_find_includes.go

@@ -318,11 +318,6 @@ func findIncludesUntilDone(ctx *types.Context, cache *includeCache, sourceFile t
 		if library, ok := sourceFile.Origin.(*libraries.Library); ok && library.UtilityDir != nil {
 			includes = append(includes, library.UtilityDir)
 		}
-		if library, ok := sourceFile.Origin.(*libraries.Library); ok && library.AdditionalIncludePaths != nil {
-			for _, el := range library.AdditionalIncludePaths {
-				includes = append(includes, el)
-			}
-		}
 		var preproc_err error
 		var preproc_stderr []byte
 		if unchanged && cache.valid {
@@ -376,6 +371,10 @@ func findIncludesUntilDone(ctx *types.Context, cache *includeCache, sourceFile t
 			return i18n.WrapError(preproc_err)
 		}
 
+		for _, el := range library.AdditionalIncludePaths {
+			appendIncludeFolder(ctx, cache, sourcePath, include, el)
+		}
+
 		// Add this library to the list of libraries, the
 		// include path and queue its source files for further
 		// include scanning