File tree 2 files changed +3
-1
lines changed
src/bootstrap/src/core/build_steps
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(
340
340
}
341
341
342
342
if target == "x86_64-fortanix-unknown-sgx"
343
+ || target. contains ( "pc-windows-gnullvm" )
343
344
|| builder. config . llvm_libunwind ( target) == LlvmLibunwind :: InTree
344
345
&& ( target. contains ( "linux" ) || target. contains ( "fuchsia" ) )
345
346
{
Original file line number Diff line number Diff line change @@ -1237,7 +1237,7 @@ impl Step for Libunwind {
1237
1237
}
1238
1238
1239
1239
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") ;
1241
1241
1242
1242
if up_to_date ( & root, & out_dir. join ( "libunwind.a" ) ) {
1243
1243
return out_dir;
@@ -1271,6 +1271,7 @@ impl Step for Libunwind {
1271
1271
cfg. flag ( "-fvisibility=hidden" ) ;
1272
1272
cfg. define ( "_LIBUNWIND_DISABLE_VISIBILITY_ANNOTATIONS" , None ) ;
1273
1273
cfg. include ( root. join ( "include" ) ) ;
1274
+ cfg. include ( root. join ( "src" ) ) ;
1274
1275
cfg. cargo_metadata ( false ) ;
1275
1276
cfg. out_dir ( & out_dir) ;
1276
1277
You can’t perform that action at this time.
0 commit comments