about summary refs log tree commit diff
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2017-01-30 00:17:57 +0000
committerbors <bors@rust-lang.org>2017-01-30 00:17:57 +0000
commit4ef2c3e075d843939aac8ffd8a07306235a1120f (patch)
tree7892daea040651fe14feb1fe0f88ce291f27ebed
parentd01e22e53f7495499864c371e13e422611b8c377 (diff)
parent149242e5190664bef3ae36e7780f33571f19c8d4 (diff)
downloadrust-4ef2c3e075d843939aac8ffd8a07306235a1120f.tar.gz
rust-4ef2c3e075d843939aac8ffd8a07306235a1120f.zip
Auto merge of #39392 - ishitatsuyuki:master, r=alexcrichton
Bootstrap: append libjemalloc_pic.a

Fix #35349
-rw-r--r--src/bootstrap/config.rs2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/bootstrap/config.rs b/src/bootstrap/config.rs
index e035f8157ff..6e077691b3a 100644
--- 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();