user0/rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #2753 from phansch/fix_build_script_for_dev_channel

Browse source 
Fix build script for dev channel
This commit is contained in:
Oliver Schneider 2018-05-13 11:56:03 +02:00 • committed by GitHub
commit be7e554c81
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 15 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

20
build.rs
View file

@ -21,6 +21,15 @@ use rustc_version::{version_meta, version_meta_for, Channel, Version, VersionMet
use ansi_term::Colour::Red;
fn main() {
check_rustc_version();
// Forward the profile to the main compilation
println!("cargo:rustc-env=PROFILE={}", env::var("PROFILE").unwrap());
// Don't rebuild even if nothing changed
println!("cargo:rerun-if-changed=build.rs");
}
fn check_rustc_version() {
let string = include_str!("min_version.txt");
let min_version_meta = version_meta_for(string)
.expect("Could not parse version string in min_version.txt");
@ -31,6 +40,12 @@ fn main() {
let min_date_str = min_version_meta.clone().commit_date
.expect("min_version.txt does not contain a rustc commit date");
// Dev channel (rustc built from git) does not have any date or commit information in rustc -vV
// `current_version_meta.commit_date` would crash, so we return early here.
if current_version_meta.channel == Channel::Dev {
return
}
let current_version = current_version_meta.clone().semver;
let current_date_str = current_version_meta.clone().commit_date
.expect("current rustc version information does not contain a rustc commit date");
@ -69,11 +84,6 @@ fn main() {
print_version_err(&current_version, &*current_date_str);
panic!("Aborting compilation due to incompatible compiler.")
}
// Forward the profile to the main compilation
println!("cargo:rustc-env=PROFILE={}", env::var("PROFILE").unwrap());
// Don't rebuild even if nothing changed
println!("cargo:rerun-if-changed=build.rs");
}
fn correct_channel(version_meta: &VersionMeta) -> bool {