Add/remove `rerun-if-changed` when necessary

diff --git a/src/Cargo.lock b/src/Cargo.lock
index c463f2bb747cc20b853fa281003e8a46d1496123..e7fa572fa3ad3cbef32c86a2ad46200bdcef9c53 100644 (file)
--- a/src/Cargo.lock
+++ b/src/Cargo.lock
@@ -221,6 +221,7 @@ dependencies = [
 name = "compiler_builtins"
 version = "0.0.0"
 dependencies = [
+ "build_helper 0.1.0",
  "core 0.0.0",
  "gcc 0.3.43 (registry+https://github.com/rust-lang/crates.io-index)",
 ]

diff --git a/src/liballoc_jemalloc/build.rs b/src/liballoc_jemalloc/build.rs
index a3402bf399427be5dcc61f95f0f6df3b1f98831e..cd2e8e4ec20fa1f9f1157c433bebc6a2567ba416 100644 (file)
--- a/src/liballoc_jemalloc/build.rs
+++ b/src/liballoc_jemalloc/build.rs
@@ -21,8 +21,6 @@
 use build_helper::{run, rerun_if_changed_anything_in_dir, up_to_date};
 
 fn main() {
-    println!("cargo:rerun-if-changed=build.rs");
-
     // FIXME: This is a hack to support building targets that don't
     // support jemalloc alongside hosts that do. The jemalloc build is
     // controlled by a feature of the std crate, and if that feature

diff --git a/src/libcompiler_builtins/Cargo.toml b/src/libcompiler_builtins/Cargo.toml
index 1a549ae823ac540e8f9e119dd2164d972a652feb..3f844b3f09e3a28648d4c3b76b30e3a9cb1f3c59 100644 (file)
--- a/src/libcompiler_builtins/Cargo.toml
+++ b/src/libcompiler_builtins/Cargo.toml
@@ -15,4 +15,5 @@ doc = false
 core = { path = "../libcore" }
 
 [build-dependencies]
+build_helper = { path = "../build_helper" }
 gcc = "0.3.27"

diff --git a/src/libcompiler_builtins/build.rs b/src/libcompiler_builtins/build.rs
index 16ecf88256670233c9f1f543ebe05f46f11abd61..564404ca71d613cc5e495bb373dcad51d81858ae 100644 (file)
--- a/src/libcompiler_builtins/build.rs
+++ b/src/libcompiler_builtins/build.rs
@@ -33,6 +33,7 @@
 //! error (if any) and then we just add it to the list. Overall, that cost is
 //! far far less than working with compiler-rt's build system over time.
 
+extern crate build_helper;
 extern crate gcc;
 
 use std::collections::BTreeMap;
@@ -404,5 +405,8 @@ fn main() {
         cfg.file(Path::new("../compiler-rt/lib/builtins").join(src));
     }
 
+    // Can't reuse `sources` list becuse it doesn't contain header files.
+    build_helper::rerun_if_changed_anything_in_dir(Path::new("../compiler-rt"));
+
     cfg.compile("libcompiler-rt.a");
 }

diff --git a/src/libflate/build.rs b/src/libflate/build.rs
index 12016980a2c656be8c5ace4d6ea27285865ca26a..78d2ef1e37d2ac16111f4a71a1ea33bf926bfd1a 100644 (file)
--- a/src/libflate/build.rs
+++ b/src/libflate/build.rs
@@ -11,6 +11,7 @@
 extern crate gcc;
 
 fn main() {
+    println!("cargo:rerun-if-changed=../rt/miniz.c");
     gcc::Config::new()
         .file("../rt/miniz.c")
         .compile("libminiz.a");

diff --git a/src/librustc_asan/build.rs b/src/librustc_asan/build.rs
index 015be14bd495a7213a62e3268b06e8bfca006156..3e95e0dbebefa452f908c2bef3181cd23d0f4a40 100644 (file)
--- a/src/librustc_asan/build.rs
+++ b/src/librustc_asan/build.rs
@@ -34,6 +34,4 @@ fn main() {
                 .unwrap())
             .join("../compiler-rt"));
     }
-
-    println!("cargo:rerun-if-changed=build.rs");
 }

diff --git a/src/librustc_llvm/build.rs b/src/librustc_llvm/build.rs
index c74a9308e4eba4913aff70e4d598d8babf7d9c8b..b74bccb70593f7517e5d5a5838a78b11300359f1 100644 (file)
--- a/src/librustc_llvm/build.rs
+++ b/src/librustc_llvm/build.rs
@@ -144,9 +144,7 @@ fn main() {
         cfg.flag("-DLLVM_RUSTLLVM");
     }
 
-    println!("cargo:rerun-if-changed=../rustllvm/PassWrapper.cpp");
-    println!("cargo:rerun-if-changed=../rustllvm/RustWrapper.cpp");
-    println!("cargo:rerun-if-changed=../rustllvm/ArchiveWrapper.cpp");
+    build_helper::rerun_if_changed_anything_in_dir(Path::new("../rustllvm"));
     cfg.file("../rustllvm/PassWrapper.cpp")
        .file("../rustllvm/RustWrapper.cpp")
        .file("../rustllvm/ArchiveWrapper.cpp")

diff --git a/src/librustc_lsan/build.rs b/src/librustc_lsan/build.rs
index 5773777d1f81b4bf600061dde806da2d0b85b869..ec968f51184fe2ecf4630a1e243c02c652cfde0d 100644 (file)
--- a/src/librustc_lsan/build.rs
+++ b/src/librustc_lsan/build.rs
@@ -34,6 +34,4 @@ fn main() {
                 .unwrap())
             .join("../compiler-rt"));
     }
-
-    println!("cargo:rerun-if-changed=build.rs");
 }

diff --git a/src/librustc_msan/build.rs b/src/librustc_msan/build.rs
index 7a4c8f7073933f7d597991cf776cfa8e7662461f..466fa641deabb4f3b1328acd6173447578fba351 100644 (file)
--- a/src/librustc_msan/build.rs
+++ b/src/librustc_msan/build.rs
@@ -34,6 +34,4 @@ fn main() {
                 .unwrap())
             .join("../compiler-rt"));
     }
-
-    println!("cargo:rerun-if-changed=build.rs");
 }

diff --git a/src/librustc_tsan/build.rs b/src/librustc_tsan/build.rs
index 84326ae8a71060440e436838afbf2080ca889e8e..95ce237b267354d80849e39851b7f6a825312f55 100644 (file)
--- a/src/librustc_tsan/build.rs
+++ b/src/librustc_tsan/build.rs
@@ -34,6 +34,4 @@ fn main() {
                 .unwrap())
             .join("../compiler-rt"));
     }
-
-    println!("cargo:rerun-if-changed=build.rs");
 }

diff --git a/src/librustdoc/build.rs b/src/librustdoc/build.rs
index fcb7af11dce2f061d2abbfd0bcc1e0af72ee6ad0..9fa6406c1d8b69d14175484997cf569f76eec5f1 100644 (file)
--- a/src/librustdoc/build.rs
+++ b/src/librustdoc/build.rs
@@ -8,9 +8,12 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+extern crate build_helper;
 extern crate gcc;
 
 fn main() {
+    let src_dir = std::path::Path::new("../rt/hoedown/src");
+    build_helper::rerun_if_changed_anything_in_dir(src_dir);
     let mut cfg = gcc::Config::new();
     cfg.file("../rt/hoedown/src/autolink.c")
        .file("../rt/hoedown/src/buffer.c")
@@ -21,6 +24,6 @@ fn main() {
        .file("../rt/hoedown/src/html_smartypants.c")
        .file("../rt/hoedown/src/stack.c")
        .file("../rt/hoedown/src/version.c")
-       .include("../rt/hoedown/src")
+       .include(src_dir)
        .compile("libhoedown.a");
 }

diff --git a/src/libstd/build.rs b/src/libstd/build.rs
index 038dea77f3ead8d570483a299e02a99059ece819..834e3d092112af94f7031a0a3d07e35de6ec4161 100644 (file)
--- a/src/libstd/build.rs
+++ b/src/libstd/build.rs
@@ -21,8 +21,6 @@
 use build_helper::{run, rerun_if_changed_anything_in_dir, up_to_date};
 
 fn main() {
-    println!("cargo:rerun-if-changed=build.rs");
-
     let target = env::var("TARGET").expect("TARGET was not set");
     let host = env::var("HOST").expect("HOST was not set");
     if cfg!(feature = "backtrace") && !target.contains("apple") && !target.contains("msvc") &&

diff --git a/src/libunwind/build.rs b/src/libunwind/build.rs
index ea0d76978339df730973b7ca36387c5ab54ade96..ed3d5212bf25677a3372f0764927a7ce02d767e0 100644 (file)
--- a/src/libunwind/build.rs
+++ b/src/libunwind/build.rs
@@ -11,6 +11,7 @@
 use std::env;
 
 fn main() {
+    println!("cargo:rerun-if-changed=build.rs");
     let target = env::var("TARGET").expect("TARGET was not set");
 
     if target.contains("linux") {