diff --git a/Source/Tools/Flax.Build/Platforms/Linux/LinuxToolchain.cs b/Source/Tools/Flax.Build/Platforms/Linux/LinuxToolchain.cs index f4e7f06cf..174b2bcee 100644 --- a/Source/Tools/Flax.Build/Platforms/Linux/LinuxToolchain.cs +++ b/Source/Tools/Flax.Build/Platforms/Linux/LinuxToolchain.cs @@ -1,9 +1,10 @@ // Copyright (c) Wojciech Figat. All rights reserved. -using System.Collections.Generic; -using System.IO; using Flax.Build.Graph; using Flax.Build.NativeCpp; +using System; +using System.Collections.Generic; +using System.IO; namespace Flax.Build { @@ -34,6 +35,10 @@ namespace Flax.Build.Platforms public LinuxToolchain(LinuxPlatform platform, TargetArchitecture architecture) : base(platform, architecture, platform.ToolchainRoot, platform.Compiler) { + // Check version + if (Utilities.ParseVersion(Configuration.LinuxClangMinVer, out var minClangVer) && ClangVersion < minClangVer) + Log.Error($"Old Clang version {ClangVersion}. Minimum supported is {minClangVer}."); + // Setup system paths var includePath = Path.Combine(ToolsetRoot, "usr", "include"); if (Directory.Exists(includePath)) diff --git a/Source/Tools/Flax.Build/Platforms/Windows/WindowsToolchain.cs b/Source/Tools/Flax.Build/Platforms/Windows/WindowsToolchain.cs index 7537cdecf..5154cdbf9 100644 --- a/Source/Tools/Flax.Build/Platforms/Windows/WindowsToolchain.cs +++ b/Source/Tools/Flax.Build/Platforms/Windows/WindowsToolchain.cs @@ -44,13 +44,8 @@ namespace Flax.Build.Platforms : base(platform, architecture, WindowsPlatformToolset.Latest, WindowsPlatformSDK.Latest) { // Select minimum Windows version - if (!Version.TryParse(Configuration.WindowsMinVer, out _minVersion)) - { - if (int.TryParse(Configuration.WindowsMinVer, out var winMinVerMajor)) - _minVersion = new Version(winMinVerMajor, 0); - else - _minVersion = new Version(7, 0); - } + if (!Utilities.ParseVersion(Configuration.WindowsMinVer, out _minVersion)) + _minVersion = new Version(7, 0); } /// diff --git a/Source/Tools/Flax.Build/Utilities/Utilities.cs b/Source/Tools/Flax.Build/Utilities/Utilities.cs index 2b971f153..85f791d09 100644 --- a/Source/Tools/Flax.Build/Utilities/Utilities.cs +++ b/Source/Tools/Flax.Build/Utilities/Utilities.cs @@ -818,5 +818,17 @@ namespace Flax.Build return 0; }); } + + internal static bool ParseVersion(string text, out Version ver) + { + if (Version.TryParse(text, out ver)) + return true; + if (int.TryParse(text, out var major)) + { + ver = new Version(major, 0); + return true; + } + return false; + } } }