diff --git a/src/build_options.rs b/src/build_options.rs index 16b2bf2ea..79d8a45a9 100644 --- a/src/build_options.rs +++ b/src/build_options.rs @@ -20,8 +20,8 @@ use structopt::StructOpt; #[serde(default)] pub struct BuildOptions { /// Control the platform tag on linux. Options are `2010` (for manylinux2010), - /// `2014` (for manylinux2014) and `off` (for the native linux tag). Note that - /// manylinux1 is unsupported by the rust compiler. Wheels with the native tag + /// `2014` (for manylinux2014), `2_24` (for manylinux_2_24) and `off` (for the native linux tag). + /// Note that manylinux1 is unsupported by the rust compiler. Wheels with the native tag /// will be rejected by pypi, unless they are separately validated by /// `auditwheel`. /// @@ -31,7 +31,7 @@ pub struct BuildOptions { /// This option is ignored on all non-linux platforms #[structopt( long, - possible_values = &["2010", "2014", "off"], + possible_values = &["2010", "2014", "2_24", "off"], case_insensitive = true, )] pub manylinux: Option, diff --git a/src/target.rs b/src/target.rs index 6d133e750..2028ee0ce 100644 --- a/src/target.rs +++ b/src/target.rs @@ -25,6 +25,9 @@ pub enum Manylinux { Manylinux2010, /// Use the manylinux2014 tag Manylinux2014, + /// Use the manylinux_2_24 tag + #[allow(non_camel_case_types)] + Manylinux_2_24, /// Use the native linux tag Off, } @@ -34,6 +37,7 @@ impl fmt::Display for Manylinux { match *self { Manylinux::Manylinux2010 => write!(f, "manylinux2010"), Manylinux::Manylinux2014 => write!(f, "manylinux2014"), + Manylinux::Manylinux_2_24 => write!(f, "manylinux_2_24"), Manylinux::Off => write!(f, "linux"), } } @@ -46,6 +50,7 @@ impl FromStr for Manylinux { match value { "2010" => Ok(Manylinux::Manylinux2010), "2014" => Ok(Manylinux::Manylinux2014), + "2_24" => Ok(Manylinux::Manylinux_2_24), "off" => Ok(Manylinux::Off), _ => Err("Invalid value for the manylinux option"), }