diff options
| author | Fabio Alessandrelli <fabio.alessandrelli@gmail.com> | 2024-09-22 13:39:06 +0200 |
|---|---|---|
| committer | David Snopek <dsnopek@gmail.com> | 2024-10-28 16:31:40 -0500 |
| commit | 30a395bf439c7d7af90d55a4a95cba71aa7e9250 (patch) | |
| tree | b6dc60d6ee42d72d4d28591126198ba222acef6e | |
| parent | a3d5d6d4d3218d83c928aa0e27cb0dc0b26baaa9 (diff) | |
| download | redot-cpp-30a395bf439c7d7af90d55a4a95cba71aa7e9250.tar.gz | |
[SCons] Remove use_clang_cl windows flag in favor of generic use_llvm
This is consistent with Godot upstream.
(cherry picked from commit 4717a781445d9d1e9044602925cd9640b73a1b28)
| -rw-r--r-- | tools/windows.py | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/tools/windows.py b/tools/windows.py index 6fd4b03..2e8d609 100644 --- a/tools/windows.py +++ b/tools/windows.py @@ -76,10 +76,9 @@ def options(opts): mingw = os.getenv("MINGW_PREFIX", "") opts.Add(BoolVariable("use_mingw", "Use the MinGW compiler instead of MSVC - only effective on Windows", False)) - opts.Add(BoolVariable("use_clang_cl", "Use the clang driver instead of MSVC - only effective on Windows", False)) opts.Add(BoolVariable("use_static_cpp", "Link MinGW/MSVC C++ runtime libraries statically", True)) opts.Add(BoolVariable("silence_msvc", "Silence MSVC's cl/link stdout bloat, redirecting errors to stderr.", True)) - opts.Add(BoolVariable("use_llvm", "Use the LLVM compiler", False)) + opts.Add(BoolVariable("use_llvm", "Use the LLVM compiler (MVSC or MinGW depending on the use_mingw flag)", False)) opts.Add("mingw_prefix", "MinGW prefix", mingw) @@ -114,7 +113,7 @@ def generate(env): env.Append(CCFLAGS=["/utf-8"]) env.Append(LINKFLAGS=["/WX"]) - if env["use_clang_cl"]: + if env["use_llvm"]: env["CC"] = "clang-cl" env["CXX"] = "clang-cl" |