Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

rustc_llvm: re-run build script when env var LLVM_CONFIG changes #42985

Merged
merged 2 commits into from
Jul 1, 2017

Conversation

venkatagiri
Copy link
Contributor

This removes the changes done in #42429 and use the newly introduced cargo:rerun-if-env-changed in rust-lang/cargo#4125.
As LLVM_CONFIG env var points to the llvm-config and changes when it gets configured in config.toml or removed from it, we can re-run the build script if this env var changes.

closes #42444

r? @alexcrichton

@Mark-Simulacrum
Copy link
Member

Could you also add the rerun-if-changed to librustc_{asan,tsan,msan,lsan}? I believe they also want to rebuild if the configuration changes...

@venkatagiri
Copy link
Contributor Author

@Mark-Simulacrum Done!

@Mark-Simulacrum
Copy link
Member

Looks good to me. Thanks!

@bors r+ rollup

@bors
Copy link
Contributor

bors commented Jun 30, 2017

📌 Commit 4f13da7 has been approved by Mark-Simulacrum

GuillaumeGomez added a commit to GuillaumeGomez/rust that referenced this pull request Jun 30, 2017
…ulacrum

rustc_llvm: re-run build script when env var LLVM_CONFIG changes

This removes the changes done in rust-lang#42429 and use the newly introduced `cargo:rerun-if-env-changed` in rust-lang/cargo#4125.
As `LLVM_CONFIG` env var points to the `llvm-config` and changes when it gets configured in `config.toml` or removed from it, we can re-run the build script if this env var changes.

closes rust-lang#42444

r? @alexcrichton
GuillaumeGomez added a commit to GuillaumeGomez/rust that referenced this pull request Jun 30, 2017
…ulacrum

rustc_llvm: re-run build script when env var LLVM_CONFIG changes

This removes the changes done in rust-lang#42429 and use the newly introduced `cargo:rerun-if-env-changed` in rust-lang/cargo#4125.
As `LLVM_CONFIG` env var points to the `llvm-config` and changes when it gets configured in `config.toml` or removed from it, we can re-run the build script if this env var changes.

closes rust-lang#42444

r? @alexcrichton
@shepmaster shepmaster added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Jun 30, 2017
GuillaumeGomez added a commit to GuillaumeGomez/rust that referenced this pull request Jun 30, 2017
…ulacrum

rustc_llvm: re-run build script when env var LLVM_CONFIG changes

This removes the changes done in rust-lang#42429 and use the newly introduced `cargo:rerun-if-env-changed` in rust-lang/cargo#4125.
As `LLVM_CONFIG` env var points to the `llvm-config` and changes when it gets configured in `config.toml` or removed from it, we can re-run the build script if this env var changes.

closes rust-lang#42444

r? @alexcrichton
bors added a commit that referenced this pull request Jun 30, 2017
Rollup of 6 pull requests

- Successful merges: #42669, #42911, #42925, #42957, #42985, #42987
- Failed merges: #42936
@bors bors merged commit 4f13da7 into rust-lang:master Jul 1, 2017
@venkatagiri venkatagiri deleted the issue_42444 branch July 2, 2017 02:41
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Don't rebuild LLVM on non-related changes to config.toml
5 participants