From 4047b90b703a09ca747d7ce8598de7e829cb4c17 Mon Sep 17 00:00:00 2001
From: akrieger <akrieger@users.noreply.github.com>
Date: Tue, 20 Feb 2024 10:54:05 -0800
Subject: [PATCH] Fixup docs and defensively insert a \ after $(LLVMInstallDir)
 (#71876)

---
 doc/COMPILING/COMPILING-VS-VCPKG.md       | 4 ++--
 msvc-full-features/Cataclysm-common.props | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/doc/COMPILING/COMPILING-VS-VCPKG.md b/doc/COMPILING/COMPILING-VS-VCPKG.md
index a5392e06715e9..fd6a5f532650f 100644
--- a/doc/COMPILING/COMPILING-VS-VCPKG.md
+++ b/doc/COMPILING/COMPILING-VS-VCPKG.md
@@ -146,8 +146,8 @@ It is possible to use `llvm-lib.exe` and `lld-link.exe` to speed up your local b
 <Project>
   <PropertyGroup>
     <CDDA_ENABLE_THIN_ARCHIVES>true</CDDA_ENABLE_THIN_ARCHIVES>
-    <CDDA_LLVM_LIB_PATH>C:\Program Files\LLVM\</CDDA_LLVM_LIB_PATH>
-    <CDDA_LLD_LINK_PATH>C:\Program Files\LLVM\</CDDA_LLD_LINK_PATH>
+    <CDDA_LLVM_LIB_PATH>C:\Program Files\LLVM\bin\</CDDA_LLVM_LIB_PATH>
+    <CDDA_LLD_LINK_PATH>C:\Program Files\LLVM\bin\</CDDA_LLD_LINK_PATH>
   </PropertyGroup>
 </Project>
 ```
diff --git a/msvc-full-features/Cataclysm-common.props b/msvc-full-features/Cataclysm-common.props
index 04a952e64c18e..c87bed68c98fb 100644
--- a/msvc-full-features/Cataclysm-common.props
+++ b/msvc-full-features/Cataclysm-common.props
@@ -14,7 +14,7 @@
     <_CDDA_RELEASE_BUILD>false</_CDDA_RELEASE_BUILD>
     <_CDDA_RELEASE_BUILD Condition="'$(CDDA_RELEASE_BUILD)'!=''">true</_CDDA_RELEASE_BUILD>
     <_CDDA_LLVM_BIN_PATH>$(VCInstallDir)Tools\Llvm\bin\</_CDDA_LLVM_BIN_PATH>
-    <_CDDA_LLVM_BIN_PATH Condition="'$(LLVMInstallDir)'!=''">$(LLVMInstallDir)bin\</_CDDA_LLVM_BIN_PATH>
+    <_CDDA_LLVM_BIN_PATH Condition="'$(LLVMInstallDir)'!=''">$(LLVMInstallDir)\bin\</_CDDA_LLVM_BIN_PATH>
     <CDDA_LLVM_LIB_PATH Condition="'$(CDDA_LLVM_LIB_PATH)'==''">$(_CDDA_LLVM_BIN_PATH)</CDDA_LLVM_LIB_PATH>
     <CDDA_LLD_LINK_PATH Condition="'$(CDDA_LLD_LINK_PATH)'==''">$(_CDDA_LLVM_BIN_PATH)</CDDA_LLD_LINK_PATH>
     <_CDDA_ENABLE_THIN_ARCHIVES>false</_CDDA_ENABLE_THIN_ARCHIVES>