build: Remove unnecessary cargo:rerun-if-env-changed annotations#74643
Merged
bors merged 4 commits intorust-lang:masterfrom Jul 23, 2020
Merged
build: Remove unnecessary cargo:rerun-if-env-changed annotations#74643bors merged 4 commits intorust-lang:masterfrom
cargo:rerun-if-env-changed annotations#74643bors merged 4 commits intorust-lang:masterfrom
Conversation
Add a FIXME to build scripts in profiler_builtins
Contributor
|
(rust_highfive has picked a reviewer for you, use r? to override) |
rust-highfive
added
the
S-waiting-on-review
petrochenkov
commented
Jul 22, 2020
|
|
||
| /// Reads an environment variable and adds it to dependencies. | ||
| /// Supposed to be used for all variables except those set for build scripts by cargo | ||
| /// https://doc.rust-lang.org/cargo/reference/environment-variables.html#environment-variables-cargo-sets-for-build-scripts |
Contributor
Author
There was a problem hiding this comment.
https://doc.rust-lang.org/cargo/reference/build-scripts.html#rerun-if-env-changed says this.
Apparently, if any of the "build script input" env vars changes, then cargo will rerun the script automatically regardless of any other rerun-if directives?
petrochenkov
commented
Jul 22, 2020
| } | ||
| pub fn verify_llvm_ir(&self) -> bool { | ||
| self.opts.debugging_opts.verify_llvm_ir || cfg!(always_verify_llvm_ir) | ||
| self.opts.debugging_opts.verify_llvm_ir || option_env!("RUSTC_VERIFY_LLVM_IR").is_some() |
Contributor
Author
There was a problem hiding this comment.
The cfg was set in librustc_middle/build.rs.
Looks like nobody noticed that it stopped working.
Member
|
Thanks! @bors r+ |
Collaborator
|
📌 Commit 7be36a8 has been approved by |
Collaborator
|
🌲 The tree is currently closed for pull requests below priority 5, this pull request will be tested once the tree is reopened |
bors
added
S-waiting-on-bors
Manishearth
added a commit
to Manishearth/rust
that referenced
this pull request
Jul 22, 2020
…ulacrum build: Remove unnecessary `cargo:rerun-if-env-changed` annotations ... and a couple of related cleanups. rustc and cargo now track the majority of env var dependencies automatically (rust-lang/cargo#8421), so the annotations are no longer necessary.
Manishearth
added a commit
to Manishearth/rust
that referenced
this pull request
Jul 22, 2020
…ulacrum build: Remove unnecessary `cargo:rerun-if-env-changed` annotations ... and a couple of related cleanups. rustc and cargo now track the majority of env var dependencies automatically (rust-lang/cargo#8421), so the annotations are no longer necessary.
Manishearth
added a commit
to Manishearth/rust
that referenced
this pull request
Jul 22, 2020
…ulacrum build: Remove unnecessary `cargo:rerun-if-env-changed` annotations ... and a couple of related cleanups. rustc and cargo now track the majority of env var dependencies automatically (rust-lang/cargo#8421), so the annotations are no longer necessary.
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Jul 23, 2020
…arth Rollup of 9 pull requests Successful merges: - rust-lang#73783 (Detect when `'static` obligation might come from an `impl`) - rust-lang#73868 (Advertise correct stable version for const control flow) - rust-lang#74460 (rustdoc: Always warn when linking from public to private items) - rust-lang#74538 (Guard against non-monomorphized type_id intrinsic call) - rust-lang#74541 (Add the aarch64-apple-darwin target ) - rust-lang#74600 (Enable perf try builder) - rust-lang#74618 (Do not ICE on assoc type with bad placeholder) - rust-lang#74631 (rustc_target: Add a target spec option for disabling `--eh-frame-hdr`) - rust-lang#74643 (build: Remove unnecessary `cargo:rerun-if-env-changed` annotations) Failed merges: r? @ghost
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
5 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
... and a couple of related cleanups.
rustc and cargo now track the majority of env var dependencies automatically (rust-lang/cargo#8421), so the annotations are no longer necessary.