diff --git a/src/bootstrap/src/core/build_steps/compile.rs b/src/bootstrap/src/core/build_steps/compile.rs
index 4bf50e19c3fd0..0174a021f76d2 100644
--- a/src/bootstrap/src/core/build_steps/compile.rs
+++ b/src/bootstrap/src/core/build_steps/compile.rs
@@ -340,6 +340,7 @@ fn copy_third_party_objects(
     }
 
     if target == "x86_64-fortanix-unknown-sgx"
+        || target.contains("pc-windows-gnullvm")
         || builder.config.llvm_libunwind(target) == LlvmLibunwind::InTree
             && (target.contains("linux") || target.contains("fuchsia"))
     {
diff --git a/src/bootstrap/src/core/build_steps/llvm.rs b/src/bootstrap/src/core/build_steps/llvm.rs
index 701bd585eee76..73561fc62ee57 100644
--- a/src/bootstrap/src/core/build_steps/llvm.rs
+++ b/src/bootstrap/src/core/build_steps/llvm.rs
@@ -1237,7 +1237,7 @@ impl Step for Libunwind {
         }
 
         let out_dir = builder.native_dir(self.target).join("libunwind");
-        let root = builder.src.join("src/llvm-project/libunwind");
+        let root = builder.src.join("src").join("llvm-project").join("libunwind");
 
         if up_to_date(&root, &out_dir.join("libunwind.a")) {
             return out_dir;
@@ -1271,6 +1271,7 @@ impl Step for Libunwind {
             cfg.flag("-fvisibility=hidden");
             cfg.define("_LIBUNWIND_DISABLE_VISIBILITY_ANNOTATIONS", None);
             cfg.include(root.join("include"));
+            cfg.include(root.join("src"));
             cfg.cargo_metadata(false);
             cfg.out_dir(&out_dir);