about summary refs log tree commit diff
path: root/src/liballoc_jemalloc
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2016-12-05 17:37:40 +0000
committerbors <bors@rust-lang.org>2016-12-05 17:37:40 +0000
commit06b8d1d3611dc9ebd37dd464b39d5d1565bbcd96 (patch)
treecafcda13107900171b389f2540e360abe2357936 /src/liballoc_jemalloc
parentd346dbc938da2f8d1bd13492331d9ec1b15bdac7 (diff)
parentacad8cceb7a60833a54650ff84300a21af754434 (diff)
downloadrust-06b8d1d3611dc9ebd37dd464b39d5d1565bbcd96.tar.gz
rust-06b8d1d3611dc9ebd37dd464b39d5d1565bbcd96.zip
Auto merge of #38111 - japaric:jemalloc, r=alexcrichton
don't rebuild alloc_jemalloc if jemalloc's .git directory has changed

the .git directory is modified by `bootstrap` when it updates this git
submodule; this triggered rebuilds every time `bootstrap` was called.

likely fixes #38094

r? @alexcrichton
Diffstat (limited to 'src/liballoc_jemalloc')
-rw-r--r--src/liballoc_jemalloc/build.rs1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/liballoc_jemalloc/build.rs b/src/liballoc_jemalloc/build.rs
index 08a1f8ae8c6..50149dfd65f 100644
--- a/src/liballoc_jemalloc/build.rs
+++ b/src/liballoc_jemalloc/build.rs
@@ -69,6 +69,7 @@ fn main() {
         .read_dir()
         .unwrap()
         .map(|e| e.unwrap())
+        .filter(|e| &*e.file_name() != ".git")
         .collect::<Vec<_>>();
     while let Some(entry) = stack.pop() {
         let path = entry.path();