Auto merge of #39392 - ishitatsuyuki:master, r=alexcrichton

Bootstrap: append libjemalloc_pic.a

Fix #35349
This commit is contained in:
bors 2017-01-30 00:17:57 +00:00
commit 4ef2c3e075

View File

@ -516,7 +516,7 @@ impl Config {
"CFG_JEMALLOC_ROOT" if value.len() > 0 => { "CFG_JEMALLOC_ROOT" if value.len() > 0 => {
let target = self.target_config.entry(self.build.clone()) let target = self.target_config.entry(self.build.clone())
.or_insert(Target::default()); .or_insert(Target::default());
target.jemalloc = Some(parse_configure_path(value)); target.jemalloc = Some(parse_configure_path(value).join("libjemalloc_pic.a"));
} }
"CFG_ARM_LINUX_ANDROIDEABI_NDK" if value.len() > 0 => { "CFG_ARM_LINUX_ANDROIDEABI_NDK" if value.len() > 0 => {
let target = "arm-linux-androideabi".to_string(); let target = "arm-linux-androideabi".to_string();