File tree Expand file tree Collapse file tree 2 files changed +3
-1
lines changed
src/bootstrap/src/core/build_steps Expand file tree Collapse file tree 2 files changed +3
-1
lines changed Original file line number Diff line number Diff line change @@ -340,6 +340,7 @@ fn copy_third_party_objects(
340340 }
341341
342342 if target == "x86_64-fortanix-unknown-sgx"
343+ || target. contains ( "pc-windows-gnullvm" )
343344 || builder. config . llvm_libunwind ( target) == LlvmLibunwind :: InTree
344345 && ( target. contains ( "linux" ) || target. contains ( "fuchsia" ) )
345346 {
Original file line number Diff line number Diff line change @@ -1237,7 +1237,7 @@ impl Step for Libunwind {
12371237 }
12381238
12391239 let out_dir = builder. native_dir ( self . target ) . join ( "libunwind" ) ;
1240- let root = builder. src . join ( "src/ llvm-project/ libunwind" ) ;
1240+ let root = builder. src . join ( "src" ) . join ( " llvm-project" ) . join ( " libunwind") ;
12411241
12421242 if up_to_date ( & root, & out_dir. join ( "libunwind.a" ) ) {
12431243 return out_dir;
@@ -1271,6 +1271,7 @@ impl Step for Libunwind {
12711271 cfg. flag ( "-fvisibility=hidden" ) ;
12721272 cfg. define ( "_LIBUNWIND_DISABLE_VISIBILITY_ANNOTATIONS" , None ) ;
12731273 cfg. include ( root. join ( "include" ) ) ;
1274+ cfg. include ( root. join ( "src" ) ) ;
12741275 cfg. cargo_metadata ( false ) ;
12751276 cfg. out_dir ( & out_dir) ;
12761277
You can’t perform that action at this time.
0 commit comments