diff options
| author | David Snopek <dsnopek@gmail.com> | 2024-10-03 08:35:35 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-10-03 08:35:35 -0500 |
| commit | 6facde3c29abe4d8b0ff365c252c9aeb16fc5f66 (patch) | |
| tree | 36ed6851d38719cd595b3467c3686e3170711bb2 | |
| parent | 709bad01d11f8fc5413fade4765ecd66daf1b6b6 (diff) | |
| parent | 4717a781445d9d1e9044602925cd9640b73a1b28 (diff) | |
| download | redot-cpp-6facde3c29abe4d8b0ff365c252c9aeb16fc5f66.tar.gz | |
Merge pull request #1602 from Faless/build/use_clang_cl_is_use_llvm
[SCons] Remove use_clang_cl windows flag in favor of generic use_llvm
| -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" |