File tree 4 files changed +0
-42
lines changed 4 files changed +0
-42
lines changed Original file line number Diff line number Diff line change @@ -504,10 +504,6 @@ impl Client {
504
504
Cmd : Command ,
505
505
F : FnOnce ( & mut Cmd ) -> io:: Result < R > ,
506
506
{
507
- // Register one-time callback on unix to unset CLO_EXEC
508
- // in child process.
509
- self . 0 . inner . pre_run ( & mut cmd) ;
510
-
511
507
let arg = self . 0 . inner . string_arg ( ) ;
512
508
// Older implementations of make use `--jobserver-fds` and newer
513
509
// implementations use `--jobserver-auth`, pass both to try to catch
Original file line number Diff line number Diff line change @@ -297,29 +297,6 @@ impl Client {
297
297
}
298
298
}
299
299
300
- pub fn pre_run < Cmd > ( & self , cmd : & mut Cmd )
301
- where
302
- Cmd : Command ,
303
- {
304
- let read = self . read . as_raw_fd ( ) ;
305
- let write = self . write . as_raw_fd ( ) ;
306
-
307
- let mut fds = Some ( [ read, write] ) ;
308
-
309
- let f = move || {
310
- // Make sure this function is executed only once,
311
- // so that the command may be reused with another
312
- // Client.
313
- for fd in fds. take ( ) . iter ( ) . flatten ( ) {
314
- set_cloexec ( * fd, false ) ?;
315
- }
316
-
317
- Ok ( ( ) )
318
- } ;
319
-
320
- unsafe { cmd. pre_exec ( f) } ;
321
- }
322
-
323
300
pub fn available ( & self ) -> io:: Result < usize > {
324
301
let mut len = MaybeUninit :: < c_int > :: uninit ( ) ;
325
302
cvt ( unsafe { libc:: ioctl ( self . read . as_raw_fd ( ) , libc:: FIONREAD , len. as_mut_ptr ( ) ) } ) ?;
Original file line number Diff line number Diff line change @@ -98,13 +98,6 @@ impl Client {
98
98
) ;
99
99
}
100
100
101
- pub fn pre_run < Cmd > ( & self , _cmd : & mut Cmd ) {
102
- panic ! (
103
- "On this platform there is no cross process jobserver support,
104
- so Client::configure_and_run is not supported."
105
- ) ;
106
- }
107
-
108
101
pub fn available ( & self ) -> io:: Result < usize > {
109
102
Ok ( * self . count ( ) )
110
103
}
Original file line number Diff line number Diff line change @@ -176,14 +176,6 @@ impl Client {
176
176
Cow :: Borrowed ( & self . name )
177
177
}
178
178
179
- pub fn pre_run < Cmd > ( & self , _cmd : & mut Cmd )
180
- where
181
- Cmd : Command ,
182
- {
183
- // nothing to do here, we gave the name of our semaphore to the
184
- // child above
185
- }
186
-
187
179
pub fn available ( & self ) -> io:: Result < usize > {
188
180
// Can't read value of a semaphore on Windows, so
189
181
// try to acquire without sleeping, since we can find out the
You can’t perform that action at this time.
0 commit comments