@@ -595,7 +595,7 @@ impl Build {
595595 . args ( [ "config" , "--file" ] )
596596 . arg ( ".gitmodules" )
597597 . args ( [ "--get-regexp" , "path" ] )
598- . run_capture ( self )
598+ . run_capture ( self . context ( ) )
599599 . stdout ( ) ;
600600 std:: thread:: scope ( |s| {
601601 // Look for `submodule.$name.path = $path`
@@ -617,7 +617,9 @@ impl Build {
617617 return ;
618618 }
619619
620- if GitInfo :: new ( false , Path :: new ( submodule) ) . is_managed_git_subrepository ( ) {
620+ if GitInfo :: new ( false , Path :: new ( submodule) , & config. execution_context )
621+ . is_managed_git_subrepository ( )
622+ {
621623 config. update_submodule ( submodule) ;
622624 }
623625 }
@@ -870,14 +872,16 @@ impl Build {
870872 if let Some ( s) = target_config. and_then ( |c| c. llvm_filecheck . as_ref ( ) ) {
871873 s. to_path_buf ( )
872874 } else if let Some ( s) = target_config. and_then ( |c| c. llvm_config . as_ref ( ) ) {
873- let llvm_bindir = command ( s) . arg ( "--bindir" ) . run_capture_stdout ( self ) . stdout ( ) ;
875+ let llvm_bindir =
876+ command ( s) . arg ( "--bindir" ) . run_capture_stdout ( self . context ( ) ) . stdout ( ) ;
874877 let filecheck = Path :: new ( llvm_bindir. trim ( ) ) . join ( exe ( "FileCheck" , target) ) ;
875878 if filecheck. exists ( ) {
876879 filecheck
877880 } else {
878881 // On Fedora the system LLVM installs FileCheck in the
879882 // llvm subdirectory of the libdir.
880- let llvm_libdir = command ( s) . arg ( "--libdir" ) . run_capture_stdout ( self ) . stdout ( ) ;
883+ let llvm_libdir =
884+ command ( s) . arg ( "--libdir" ) . run_capture_stdout ( self . context ( ) ) . stdout ( ) ;
881885 let lib_filecheck =
882886 Path :: new ( llvm_libdir. trim ( ) ) . join ( "llvm" ) . join ( exe ( "FileCheck" , target) ) ;
883887 if lib_filecheck. exists ( ) {
@@ -1598,7 +1602,7 @@ Executed at: {executed_at}"#,
15981602 self . config. stage0_metadata. config. nightly_branch
15991603 ) )
16001604 . run_always ( )
1601- . run_capture ( self )
1605+ . run_capture ( self . context ( ) )
16021606 . stdout ( )
16031607 } ) ;
16041608 let n = count. trim ( ) . parse ( ) . unwrap ( ) ;
0 commit comments