GoaLitiuM/FlaxEngine
1
0
Fork 0
Code Issues Pull Requests Actions 7 Packages Projects Releases Wiki Activity

Fix AOT libs rebuild when corlib was modified to avoid version mismatch

Browse Source
This commit is contained in:
Wojtek Figat
2025-07-23 18:15:52 +02:00
parent 8ac2385447
commit 735d611de1
1 changed files with 19 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
Source/Tools/Flax.Build/Build/DotNet/DotNetAOT.cs
View File

@@ -351,10 +351,10 @@ namespace Flax.Build
}
// Run compilation
bool failed = false;
bool validCache = true;
bool failed = false, validCache = true, coreLibDirty = false;
string platformToolsPath;
{
// Get platform tools
var options = new Toolchain.CSharpOptions
{
Action = Toolchain.CSharpOptions.ActionTypes.GetPlatformTools,
@@ -365,6 +365,21 @@ namespace Flax.Build
buildToolchain.CompileCSharp(ref options);
platformToolsPath = options.PlatformToolsPath;
}
{
// Check if core library has been modified
var options = new Toolchain.CSharpOptions
{
Action = Toolchain.CSharpOptions.ActionTypes.GetOutputFiles,
InputFiles = new List<string>() { coreLibPaths[0] },
OutputFiles = new List<string>(),
AssembliesPath = aotAssembliesPath,
ClassLibraryPath = dotnetLibPath,
PlatformToolsPath = platformToolsPath,
EnableDebugSymbols = false,
EnableToolDebug = dotnetAotDebug,
};
buildToolchain.CompileCSharp(ref options);
coreLibDirty = File.GetLastWriteTime(options.InputFiles[0]) > File.GetLastWriteTime(options.OutputFiles[0]);
if (!Directory.Exists(platformToolsPath))
throw new Exception("Missing platform tools " + platformToolsPath);
Log.Info("Platform tools found in: " + platformToolsPath);
@@ -393,7 +408,8 @@ namespace Flax.Build
buildToolchain.CompileCSharp(ref options);
// Skip if output is already generated and is newer than a source assembly
if (!File.Exists(options.OutputFiles[0]) || File.GetLastWriteTime(assemblyPath) > File.GetLastWriteTime(options.OutputFiles[0]))
// Force run AOT if corelib has been modified (all libs depend on its GUID)
if (!File.Exists(options.OutputFiles[0]) || File.GetLastWriteTime(assemblyPath) > File.GetLastWriteTime(options.OutputFiles[0]) || coreLibDirty)
{
if (dotnetAotDebug)
{