File tree 1 file changed +8
-4
lines changed
1 file changed +8
-4
lines changed Original file line number Diff line number Diff line change @@ -4106,9 +4106,11 @@ mod c {
4106
4106
// also needs to satisfy intrinsics that jemalloc or C in general may
4107
4107
// need, so include a few more that aren't typically needed by
4108
4108
// LLVM/Rust.
4109
- sources. extend ( & [
4110
- "ffsdi2.c" ,
4111
- ] ) ;
4109
+ if cfg ! ( feature = "rustbuild" ) {
4110
+ sources. extend ( & [
4111
+ "ffsdi2.c" ,
4112
+ ] ) ;
4113
+ }
4112
4114
4113
4115
if target_os != "ios" {
4114
4116
sources. extend (
@@ -4359,7 +4361,9 @@ mod c {
4359
4361
sources. remove ( & [ "aeabi_cdcmp" , "aeabi_cfcmp" ] ) ;
4360
4362
}
4361
4363
4362
- let root = if env:: var_os ( "CARGO_FEATURE_RUSTBUILD" ) . is_some ( ) {
4364
+ // When compiling in rustbuild (the rust-lang/rust repo) this build
4365
+ // script runs from a directory other than this root directory.
4366
+ let root = if cfg ! ( feature = "rustbuild" ) {
4363
4367
Path :: new ( "../../libcompiler_builtins" )
4364
4368
} else {
4365
4369
Path :: new ( "." )
You can’t perform that action at this time.
0 commit comments