From 4717a781445d9d1e9044602925cd9640b73a1b28 Mon Sep 17 00:00:00 2001 From: Fabio Alessandrelli Date: Sun, 22 Sep 2024 13:39:06 +0200 Subject: [PATCH] [SCons] Remove use_clang_cl windows flag in favor of generic use_llvm This is consistent with Godot upstream. --- tools/windows.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/tools/windows.py b/tools/windows.py index 6fd4b038..2e8d609e 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"