diff options
| author | bors <bors@rust-lang.org> | 2020-07-23 00:37:58 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2020-07-23 00:37:58 +0000 |
| commit | e8b55a4ad230ebec762fdfc4f241ba98a98560af (patch) | |
| tree | 4eddd1d3f96a5d7137c88cfa68f81aeeb0a11d5b /src/libstd | |
| parent | 4a86573c6b5c8b1ba179487f06e5f69a6f37e895 (diff) | |
| parent | b32383ca901b01192e8110afab8421a20062caa4 (diff) | |
| download | rust-e8b55a4ad230ebec762fdfc4f241ba98a98560af.tar.gz rust-e8b55a4ad230ebec762fdfc4f241ba98a98560af.zip | |
Auto merge of #74662 - Manishearth:rollup-jdt7t71, r=Manishearth
Rollup of 9 pull requests Successful merges: - #73783 (Detect when `'static` obligation might come from an `impl`) - #73868 (Advertise correct stable version for const control flow) - #74460 (rustdoc: Always warn when linking from public to private items) - #74538 (Guard against non-monomorphized type_id intrinsic call) - #74541 (Add the aarch64-apple-darwin target ) - #74600 (Enable perf try builder) - #74618 (Do not ICE on assoc type with bad placeholder) - #74631 (rustc_target: Add a target spec option for disabling `--eh-frame-hdr`) - #74643 (build: Remove unnecessary `cargo:rerun-if-env-changed` annotations) Failed merges: r? @ghost
Diffstat (limited to 'src/libstd')
| -rw-r--r-- | src/libstd/Cargo.toml | 1 | ||||
| -rw-r--r-- | src/libstd/build.rs | 1 |
2 files changed, 1 insertions, 1 deletions
diff --git a/src/libstd/Cargo.toml b/src/libstd/Cargo.toml index 42403bdb1bc..f5d8119f711 100644 --- a/src/libstd/Cargo.toml +++ b/src/libstd/Cargo.toml @@ -2,7 +2,6 @@ authors = ["The Rust Project Developers"] name = "std" version = "0.0.0" -build = "build.rs" license = "MIT OR Apache-2.0" repository = "https://github.com/rust-lang/rust.git" description = "The Rust Standard Library" diff --git a/src/libstd/build.rs b/src/libstd/build.rs index 58fb6fda19a..83073cc77dd 100644 --- a/src/libstd/build.rs +++ b/src/libstd/build.rs @@ -1,6 +1,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") { if target.contains("android") { |