From 5e614c963395bb817d91cf75669862164ada94de Mon Sep 17 00:00:00 2001
From: henrik karlsson <henrik.karlsson@epicgames.com>
Date: Tue, 6 Jun 2023 16:24:25 -0400
Subject: [PATCH] [UBT] * IWYUToolChain - Fixed bug where ordering of produced
 files had changed and toolchain assumed .o file would be first

#rb none

[CL 25826870 by henrik karlsson in ue5-main branch]
---
 .../Programs/UnrealBuildTool/ToolChain/IWYUToolChain.cs     | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/Engine/Source/Programs/UnrealBuildTool/ToolChain/IWYUToolChain.cs b/Engine/Source/Programs/UnrealBuildTool/ToolChain/IWYUToolChain.cs
index 2c67c54aa852..30617e004e09 100644
--- a/Engine/Source/Programs/UnrealBuildTool/ToolChain/IWYUToolChain.cs
+++ b/Engine/Source/Programs/UnrealBuildTool/ToolChain/IWYUToolChain.cs
@@ -100,7 +100,9 @@ namespace UnrealBuildTool
 
 				Action Action = CompileCPPFile(CompileEnvironment, SourceFile, OutputDir, ModuleName, Graph, GlobalArguments, new CPPOutput());
 
-				string CommandLineArgs = CommonCommandLineArgs + " -Xiwyu --write_json_path=\"" + Action.ProducedItems.First() + "\" ";
+				FileItem IwyuItem = Action.ProducedItems.First(i => i.Name.EndsWith(".iwyu"));
+
+				string CommandLineArgs = CommonCommandLineArgs + " -Xiwyu --write_json_path=\"" + IwyuItem + "\" ";
 				if (SourceFile.HasExtension(".cpp"))
 				{
 					List<FileItem>? InlinedFiles;
@@ -119,7 +121,7 @@ namespace UnrealBuildTool
 				}
 
 				Action.CommandArguments = CommandLineArgs + Action.CommandArguments;
-				IwyuFiles.Add(Action.ProducedItems.First());
+				IwyuFiles.Add(IwyuItem);
 			}
 
 			return new CPPOutput() { ObjectFiles = IwyuFiles };