@@ -115,15 +115,14 @@ pub struct Config {
115115 pub hosts : Vec < Interned < String > > ,
116116 pub targets : Vec < Interned < String > > ,
117117 pub local_rebuild : bool ,
118+ pub jemalloc : bool ,
118119
119120 // dist misc
120121 pub dist_sign_folder : Option < PathBuf > ,
121122 pub dist_upload_addr : Option < String > ,
122123 pub dist_gpg_password_file : Option < PathBuf > ,
123124
124125 // libstd features
125- pub debug_jemalloc : bool ,
126- pub use_jemalloc : bool ,
127126 pub backtrace : bool , // support for RUST_BACKTRACE
128127 pub wasm_syscall : bool ,
129128
@@ -165,7 +164,6 @@ pub struct Target {
165164pub llvm_config : Option < PathBuf > ,
166165 /// Some(path to FileCheck) if one was specified.
167166pub llvm_filecheck : Option < PathBuf > ,
168- pub jemalloc : Option < PathBuf > ,
169167 pub cc : Option < PathBuf > ,
170168 pub cxx : Option < PathBuf > ,
171169 pub ar : Option < PathBuf > ,
@@ -262,7 +260,7 @@ struct Llvm {
262260 link_jobs : Option < u32 > ,
263261 link_shared : Option < bool > ,
264262 version_suffix : Option < String > ,
265- clang_cl : Option < String >
263+ clang_cl : Option < String > ,
266264}
267265
268266#[ derive( Deserialize , Default , Clone ) ]
@@ -300,8 +298,6 @@ struct Rust {
300298 debuginfo_only_std : Option < bool > ,
301299 debuginfo_tools : Option < bool > ,
302300 experimental_parallel_queries : Option < bool > ,
303- debug_jemalloc : Option < bool > ,
304- use_jemalloc : Option < bool > ,
305301 backtrace : Option < bool > ,
306302 default_linker : Option < String > ,
307303 channel : Option < String > ,
@@ -327,6 +323,7 @@ struct Rust {
327323 backtrace_on_ice : Option < bool > ,
328324 verify_llvm_ir : Option < bool > ,
329325 remap_debuginfo : Option < bool > ,
326+ jemalloc : Option < bool > ,
330327}
331328
332329/// TOML representation of how each build target is configured.
@@ -335,7 +332,6 @@ struct Rust {
335332struct TomlTarget {
336333 llvm_config : Option < String > ,
337334 llvm_filecheck : Option < String > ,
338- jemalloc : Option < String > ,
339335 cc : Option < String > ,
340336 cxx : Option < String > ,
341337 ar : Option < String > ,
@@ -361,7 +357,6 @@ impl Config {
361357 config. llvm_enabled = true ;
362358 config. llvm_optimize = true ;
363359 config. llvm_version_check = true ;
364- config. use_jemalloc = true ;
365360 config. backtrace = true ;
366361 config. rust_optimize = true ;
367362 config. rust_optimize_tests = true ;
@@ -497,7 +492,6 @@ impl Config {
497492 let mut debuginfo_only_std = None ;
498493 let mut debuginfo_tools = None ;
499494 let mut debug = None ;
500- let mut debug_jemalloc = None ;
501495 let mut debuginfo = None ;
502496 let mut debug_assertions = None ;
503497 let mut optimize = None ;
@@ -539,12 +533,11 @@ impl Config {
539533 debuginfo_tools = rust. debuginfo_tools ;
540534 optimize = rust. optimize ;
541535 ignore_git = rust. ignore_git ;
542- debug_jemalloc = rust. debug_jemalloc ;
543536 set ( & mut config. rust_optimize_tests , rust. optimize_tests ) ;
544537 set ( & mut config. rust_debuginfo_tests , rust. debuginfo_tests ) ;
545538 set ( & mut config. codegen_tests , rust. codegen_tests ) ;
546539 set ( & mut config. rust_rpath , rust. rpath ) ;
547- set ( & mut config. use_jemalloc , rust. use_jemalloc ) ;
540+ set ( & mut config. jemalloc , rust. jemalloc ) ;
548541 set ( & mut config. backtrace , rust. backtrace ) ;
549542 set ( & mut config. channel , rust. channel . clone ( ) ) ;
550543 set ( & mut config. rust_dist_src , rust. dist_src ) ;
@@ -592,9 +585,6 @@ impl Config {
592585 if let Some ( ref s) = cfg. llvm_filecheck {
593586 target. llvm_filecheck = Some ( config. src . join ( s) ) ;
594587 }
595- if let Some ( ref s) = cfg. jemalloc {
596- target. jemalloc = Some ( config. src . join ( s) ) ;
597- }
598588 if let Some ( ref s) = cfg. android_ndk {
599589 target. ndk = Some ( config. src . join ( s) ) ;
600590 }
@@ -640,7 +630,6 @@ impl Config {
640630 config. rust_debuginfo_tools = debuginfo_tools. unwrap_or ( false ) ;
641631
642632 let default = debug == Some ( true ) ;
643- config. debug_jemalloc = debug_jemalloc. unwrap_or ( default) ;
644633 config. rust_debuginfo = debuginfo. unwrap_or ( default) ;
645634 config. rust_debug_assertions = debug_assertions. unwrap_or ( default) ;
646635
0 commit comments