From cfc4fd00d35e823a9785583bec9fc6ab04a1247b Mon Sep 17 00:00:00 2001 From: Matthijs Kooijman Date: Thu, 2 Mar 2017 16:24:02 +0100 Subject: [PATCH] ContainerFindIncludes: Add some temporary variables This slightly cleans up a function call. Signed-off-by: Matthijs Kooijman --- container_find_includes.go | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/container_find_includes.go b/container_find_includes.go index 15cdc3b9..df0fca81 100644 --- a/container_find_includes.go +++ b/container_find_includes.go @@ -292,6 +292,8 @@ func writeCache(cache *includeCache, path string) error { func findIncludesUntilDone(ctx *types.Context, cache *includeCache, sourceFile types.SourceFile) error { sourcePath := sourceFile.SourcePath(ctx) + depPath := sourceFile.DepfilePath(ctx) + objPath := sourceFile.ObjectPath(ctx) targetFilePath := utils.NULLFile() // TODO: This should perhaps also compare against the @@ -306,7 +308,7 @@ func findIncludesUntilDone(ctx *types.Context, cache *includeCache, sourceFile t // TODO: This reads the dependency file, but the actual building // does it again. Should the result be somehow cached? Perhaps // remove the object file if it is found to be stale? - unchanged, err := builder_utils.ObjFileIsUpToDate(ctx, sourcePath, sourceFile.ObjectPath(ctx), sourceFile.DepfilePath(ctx)) + unchanged, err := builder_utils.ObjFileIsUpToDate(ctx, sourcePath, objPath, depPath) if err != nil { return i18n.WrapError(err) }