diff options
| author | Steven Fackler <[email protected]> | 2018-05-19 21:09:04 -0700 |
|---|---|---|
| committer | Steven Fackler <[email protected]> | 2018-05-20 11:29:27 -0700 |
| commit | 862d78416118cf8854feab92cd0ddb826e83199a (patch) | |
| tree | fd8ddc8e71fa3fcc46e091ccb8e0f7c937e82941 /openssl-sys/build/cfgs.rs | |
| parent | Merge pull request #922 from sfackler/libressl-min-max-version (diff) | |
| download | rust-openssl-862d78416118cf8854feab92cd0ddb826e83199a.tar.xz rust-openssl-862d78416118cf8854feab92cd0ddb826e83199a.zip | |
Clean up openssl-sys cfgs
Diffstat (limited to 'openssl-sys/build/cfgs.rs')
| -rw-r--r-- | openssl-sys/build/cfgs.rs | 26 |
1 files changed, 12 insertions, 14 deletions
diff --git a/openssl-sys/build/cfgs.rs b/openssl-sys/build/cfgs.rs index 3e063aa3..4648f6f5 100644 --- a/openssl-sys/build/cfgs.rs +++ b/openssl-sys/build/cfgs.rs @@ -7,37 +7,35 @@ pub fn get(openssl_version: Option<u64>, libressl_version: Option<u64>) -> Vec<& if libressl_version >= 0x2_05_01_00_0 { cfgs.push("libressl251"); } - if libressl_version >= 0x2_06_01_00_0 { cfgs.push("libressl261"); } - if libressl_version >= 0x2_07_00_00_0 { cfgs.push("libressl270"); } } else { let openssl_version = openssl_version.unwrap(); + if openssl_version >= 0x1_00_01_00_0 { + cfgs.push("ossl101"); + } + if openssl_version >= 0x1_00_02_00_0 { + cfgs.push("ossl102"); + } if openssl_version >= 0x1_00_02_08_0 { cfgs.push("ossl102h"); } - + if openssl_version >= 0x1_01_00_00_0 { + cfgs.push("ossl110"); + } + if openssl_version >= 0x1_01_00_06_0 { + cfgs.push("ossl110f"); + } if openssl_version >= 0x1_01_00_07_0 { cfgs.push("ossl110g"); } - if openssl_version >= 0x1_01_01_00_0 { cfgs.push("ossl111"); - cfgs.push("ossl110"); - } else if openssl_version >= 0x1_01_00_06_0 { - cfgs.push("ossl110"); - cfgs.push("ossl110f"); - } else if openssl_version >= 0x1_01_00_00_0 { - cfgs.push("ossl110"); - } else if openssl_version >= 0x1_00_02_00_0 { - cfgs.push("ossl102"); - } else if openssl_version >= 0x1_00_01_00_0 { - cfgs.push("ossl101"); } } |