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

bors · bors · commit 4ef2c3e075d8 · 2017-01-30T00:17:57.000Z
Bootstrap: append libjemalloc_pic.a Fix #35349
diff --git a/src/bootstrap/config.rs b/src/bootstrap/config.rs
@@ -516,7 +516,7 @@ impl Config {
                 "CFG_JEMALLOC_ROOT" if value.len() > 0 => {
                     let target = self.target_config.entry(self.build.clone())
                                      .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 => {
                     let target = "arm-linux-androideabi".to_string();

Original file line number	Diff line number	Diff line change
`@@ -516,7 +516,7 @@ impl Config {`
`516`	`516`	`"CFG_JEMALLOC_ROOT" if value.len() > 0 => {`
`517`	`517`	`let target = self.target_config.entry(self.build.clone())`
`518`	`518`	`.or_insert(Target::default());`
`519`		`- target.jemalloc = Some(parse_configure_path(value));`
	`519`	`+ target.jemalloc = Some(parse_configure_path(value).join("libjemalloc_pic.a"));`
`520`	`520`	`}`
`521`	`521`	`"CFG_ARM_LINUX_ANDROIDEABI_NDK" if value.len() > 0 => {`
`522`	`522`	`let target = "arm-linux-androideabi".to_string();`