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

Add unified min Clang version 13 for Linux

Browse Source
This commit is contained in:
Wojtek Figat
2025-06-12 18:05:01 +02:00
parent eadb4411ff
commit e2d9452994
8 changed files with 27 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Source/Tools/Flax.Build/Deps/Dependencies/Assimp.cs
View File

@@ -124,9 +124,9 @@ namespace Flax.Deps.Dependencies
{ {
var envVars = new Dictionary<string, string> var envVars = new Dictionary<string, string>
{ {
{ "CC", "clang-13" }, { "CC", "clang-" + Configuration.LinuxClangMinVer },
{ "CC_FOR_BUILD", "clang-13" }, { "CC_FOR_BUILD", "clang-" + Configuration.LinuxClangMinVer },
{ "CXX", "clang++-13" }, { "CXX", "clang++-" + Configuration.LinuxClangMinVer },
}; };
// Build for Linux // Build for Linux

4
Source/Tools/Flax.Build/Deps/Dependencies/OpenAL.cs
View File

@@ -121,8 +121,8 @@ namespace Flax.Deps.Dependencies
}; };
var envVars = new Dictionary<string, string> var envVars = new Dictionary<string, string>
{ {
{ "CC", "clang-7" }, { "CC", "clang-" + Configuration.LinuxClangMinVer },
{ "CC_FOR_BUILD", "clang-7" } { "CC_FOR_BUILD", "clang-" + Configuration.LinuxClangMinVer }
}; };
var config = "-DALSOFT_REQUIRE_ALSA=ON -DALSOFT_REQUIRE_OSS=ON -DALSOFT_REQUIRE_PORTAUDIO=ON -DALSOFT_REQUIRE_PULSEAUDIO=ON -DALSOFT_REQUIRE_JACK=ON -DALSOFT_EMBED_HRTF_DATA=YES"; var config = "-DALSOFT_REQUIRE_ALSA=ON -DALSOFT_REQUIRE_OSS=ON -DALSOFT_REQUIRE_PORTAUDIO=ON -DALSOFT_REQUIRE_PULSEAUDIO=ON -DALSOFT_REQUIRE_JACK=ON -DALSOFT_EMBED_HRTF_DATA=YES";

5
Source/Tools/Flax.Build/Deps/Dependencies/PhysX.cs
View File

@@ -7,7 +7,6 @@ using System.Linq;
using System.Xml; using System.Xml;
using Flax.Build; using Flax.Build;
using Flax.Build.Platforms; using Flax.Build.Platforms;
using Flax.Build.Projects.VisualStudio;
using Flax.Deploy; using Flax.Deploy;
namespace Flax.Deps.Dependencies namespace Flax.Deps.Dependencies
@@ -237,8 +236,8 @@ namespace Flax.Deps.Dependencies
break; break;
} }
case TargetPlatform.Linux: case TargetPlatform.Linux:
envVars.Add("CC", "clang-7"); envVars.Add("CC", "clang-" + Configuration.LinuxClangMinVer);
envVars.Add("CC_FOR_BUILD", "clang-7"); envVars.Add("CC_FOR_BUILD", "clang-" + Configuration.LinuxClangMinVer);
break; break;
case TargetPlatform.Mac: break; case TargetPlatform.Mac: break;
default: throw new InvalidPlatformException(BuildPlatform); default: throw new InvalidPlatformException(BuildPlatform);

4
Source/Tools/Flax.Build/Deps/Dependencies/curl.cs
View File

@@ -105,8 +105,8 @@ namespace Flax.Deps.Dependencies
}; };
var envVars = new Dictionary<string, string> var envVars = new Dictionary<string, string>
{ {
{ "CC", "clang-7" }, { "CC", "clang-" + Configuration.LinuxClangMinVer },
{ "CC_FOR_BUILD", "clang-7" }, { "CC_FOR_BUILD", "clang-" + Configuration.LinuxClangMinVer },
}; };
var buildDir = Path.Combine(root, "build"); var buildDir = Path.Combine(root, "build");
SetupDirectory(buildDir, true); SetupDirectory(buildDir, true);

4
Source/Tools/Flax.Build/Deps/Dependencies/freetype.cs
View File

@@ -116,8 +116,8 @@ namespace Flax.Deps.Dependencies
{ {
var envVars = new Dictionary<string, string> var envVars = new Dictionary<string, string>
{ {
{ "CC", "clang-7" }, { "CC", "clang-" + Configuration.LinuxClangMinVer },
{ "CC_FOR_BUILD", "clang-7" } { "CC_FOR_BUILD", "clang-" + Configuration.LinuxClangMinVer }
}; };
// Fix scripts // Fix scripts

4
Source/Tools/Flax.Build/Deps/Dependencies/mono.cs
View File

@@ -546,8 +546,8 @@ namespace Flax.Deps.Dependencies
{ {
var envVars = new Dictionary<string, string> var envVars = new Dictionary<string, string>
{ {
{ "CC", "clang-7" }, { "CC", "clang-" + Configuration.LinuxClangMinVer },
{ "CXX", "clang++-7" } { "CXX", "clang++-" + Configuration.LinuxClangMinVer }
}; };
var monoOptions = new[] var monoOptions = new[]
{ {

4
Source/Tools/Flax.Build/Deps/Dependencies/vorbis.cs
View File

@@ -365,8 +365,8 @@ namespace Flax.Deps.Dependencies
var envVars = new Dictionary<string, string> var envVars = new Dictionary<string, string>
{ {
{ "CC", "clang-7" }, { "CC", "clang-" + Configuration.LinuxClangMinVer },
{ "CC_FOR_BUILD", "clang-7" } { "CC_FOR_BUILD", "clang-" + Configuration.LinuxClangMinVer }
}; };
var buildDir = Path.Combine(root, "build"); var buildDir = Path.Combine(root, "build");

12
Source/Tools/Flax.Build/Platforms/Linux/LinuxToolchain.cs
View File

@@ -5,6 +5,18 @@ using System.IO;
using Flax.Build.Graph; using Flax.Build.Graph;
using Flax.Build.NativeCpp; using Flax.Build.NativeCpp;
namespace Flax.Build
{
partial class Configuration
{
/// <summary>
/// Specifies the minimum Clang compiler version to use on Linux (eg. 10).
/// </summary>
[CommandLine("linuxClangMinVer", "<version>", "Specifies the minimum Clang compiler version to use on Linux (eg. 10).")]
public static string LinuxClangMinVer = "13";
}
}
namespace Flax.Build.Platforms namespace Flax.Build.Platforms
{ {
/// <summary> /// <summary>