[clang] Use the Windows SDK arguments over the environment (PR #144805)

[via cfe-commits]

github-actions[bot] wrote:

<!--LLVM CODE FORMAT COMMENT: {clang-format}-->


:warning: C/C++ code formatter, clang-format found issues in your code. :warning:

<details>
<summary>
You can test this locally with the following command:
</summary>

``````````bash
git-clang-format --diff HEAD~1 HEAD --extensions cpp -- clang/lib/Driver/ToolChains/MSVC.cpp
``````````

</details>

<details>
<summary>
View the diff from clang-format here.
</summary>

``````````diff
diff --git a/clang/lib/Driver/ToolChains/MSVC.cpp b/clang/lib/Driver/ToolChains/MSVC.cpp
index 632cc3a0a..32a237323 100644
--- a/clang/lib/Driver/ToolChains/MSVC.cpp
+++ b/clang/lib/Driver/ToolChains/MSVC.cpp
@@ -96,11 +96,10 @@ void visualstudio::Linker::ConstructJob(Compilation &C, const JobAction &JA,
   // the environment variable is set however, assume the user knows what
   // they're doing. If the user passes /vctoolsdir or /winsdkdir or any of the
   // other Windows SDK options, trust that over env vars.
-  const Arg *A = Args.getLastArg(options::OPT__SLASH_vctoolsdir,
-                                 options::OPT__SLASH_vctoolsversion,
-                                 options::OPT__SLASH_winsysroot,
-                                 options::OPT__SLASH_winsdkdir,
-                                 options::OPT__SLASH_winsdkversion);
+  const Arg *A = Args.getLastArg(
+      options::OPT__SLASH_vctoolsdir, options::OPT__SLASH_vctoolsversion,
+      options::OPT__SLASH_winsysroot, options::OPT__SLASH_winsdkdir,
+      options::OPT__SLASH_winsdkversion);
   if (A) {
     // cl.exe doesn't find the DIA SDK automatically, so this too requires
     // explicit flags and doesn't automatically look in "DIA SDK" relative
@@ -681,11 +680,10 @@ void MSVCToolChain::AddClangSystemIncludeArgs(const ArgList &DriverArgs,
   // Windows SDK options. If so, we assume the user knows what they're doing
   // and don't try to find the include directories automatically.
   // If not, we try to find the include directories automatically.
-  const Arg *A = DriverArgs.getLastArg(options::OPT__SLASH_vctoolsdir,
-                                       options::OPT__SLASH_vctoolsversion,
-                                       options::OPT__SLASH_winsysroot,
-                                       options::OPT__SLASH_winsdkdir,
-                                       options::OPT__SLASH_winsdkversion);
+  const Arg *A = DriverArgs.getLastArg(
+      options::OPT__SLASH_vctoolsdir, options::OPT__SLASH_vctoolsversion,
+      options::OPT__SLASH_winsysroot, options::OPT__SLASH_winsdkdir,
+      options::OPT__SLASH_winsdkversion);
 
   // Add DIA SDK include if requested.
   if (A) {

``````````

</details>


https://github.com/llvm/llvm-project/pull/144805