Unverified Commit 4d2379f2 authored by Steven Fackler's avatar Steven Fackler Committed by GitHub
Browse files

Tweak pkg-config logic 

We don't want to broaden the contexts that we automatically enable PKG_CONFIG_ALLOW_CROSS
parent e8f04434

openssl-sys/build/find_normal.rs

+3 −4
Original line number Diff line number Diff line
@@ -197,11 +197,10 @@ https://github.com/sfackler/rust-openssl#windows 
fn try_pkg_config() {

    let target = env::var("TARGET").unwrap();



    // If we're using mingw (windows-gnu*), we can use pkg-config, but we need

    // to allow mismatched host/target.

    if target.contains("windows-gnu") {

    // FIXME we really shouldn't be automatically enabling this

    if target.contains("windows-gnu") && host.contains("windows") {

        env::set_var("PKG_CONFIG_ALLOW_CROSS", "1");

    } else if target.contains("windows") {

    } else if target.contains("windows-msvc") {

        // MSVC targets use vcpkg instead.

        return;

    }