File tree 2 files changed +8
-4
lines changed
2 files changed +8
-4
lines changed Original file line number Diff line number Diff line change @@ -793,6 +793,8 @@ def set_dist_environment(self, url):
793
793
794
794
def check_vendored_status (self ):
795
795
"""Check that vendoring is configured properly"""
796
+ # keep this consistent with the equivalent check in rustbuild:
797
+ # https://github.com/rust-lang/rust/blob/a8a33cf27166d3eabaffc58ed3799e054af3b0c6/src/bootstrap/lib.rs#L399-L405
796
798
if 'SUDO_USER' in os .environ and not self .use_vendored_sources :
797
799
if os .getuid () == 0 :
798
800
self .use_vendored_sources = True
Original file line number Diff line number Diff line change @@ -396,11 +396,13 @@ impl Build {
396
396
let src = config. src . clone ( ) ;
397
397
let out = config. out . clone ( ) ;
398
398
399
+ // keep this consistent with the equivalent check in x.py:
400
+ // https://github.com/rust-lang/rust/blob/a8a33cf27166d3eabaffc58ed3799e054af3b0c6/src/bootstrap/bootstrap.py#L796-L797
399
401
let is_sudo = match env:: var_os ( "SUDO_USER" ) {
400
- Some ( sudo_user ) => match env :: var_os ( "USER" ) {
401
- Some ( user ) => user != sudo_user ,
402
- None => false ,
403
- } ,
402
+ Some ( _sudo_user ) => {
403
+ let uid = unsafe { libc :: getuid ( ) } ;
404
+ uid == 0
405
+ }
404
406
None => false ,
405
407
} ;
406
408
You can’t perform that action at this time.
0 commit comments