Unverified Commit 9f3cf990 authored by Steven Fackler's avatar Steven Fackler Committed by GitHub
Browse files

Merge pull request #1103 from alexcrichton/autocfg 

Switch from `rustc_version` to `autocfg`
parents 3331908a 06577cbf

openssl-sys/Cargo.toml

+1 −1
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ libc = "0.2" 
cc = "1.0"

openssl-src = { version = "111.0.1", optional = true }

pkg-config = "0.3.9"

rustc_version = "0.2"

autocfg = "0.1.2"



[target.'cfg(target_env = "msvc")'.build-dependencies]

vcpkg = "0.2"

openssl-sys/build/main.rs

+3 −3
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ extern crate cc; 
#[cfg(feature = "vendored")]

extern crate openssl_src;

extern crate pkg_config;

extern crate rustc_version;

extern crate autocfg;

#[cfg(target_env = "msvc")]

extern crate vcpkg;
@@ -94,9 +94,9 @@ fn main() { 
}



fn check_rustc_versions() {

    let version = rustc_version::version().unwrap();

    let cfg = autocfg::new();



    if version >= rustc_version::Version::new(1, 31, 0) {

    if cfg.probe_rustc_version(1, 31) {

        println!("cargo:rustc-cfg=const_fn");

    }

}