From 69266de0c1b61a684255572c636e66b031c3c6fd Mon Sep 17 00:00:00 2001 From: Justin Smith Date: Tue, 3 Dec 2024 12:34:00 -0500 Subject: [PATCH] AWS-LC-FIPS 3.0 builds with Clang 19 --- aws-lc-fips-sys/builder/cmake_builder.rs | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/aws-lc-fips-sys/builder/cmake_builder.rs b/aws-lc-fips-sys/builder/cmake_builder.rs index 341ef32a876..21a5ff651f6 100644 --- a/aws-lc-fips-sys/builder/cmake_builder.rs +++ b/aws-lc-fips-sys/builder/cmake_builder.rs @@ -256,12 +256,8 @@ impl CmakeBuilder { } } if compiler.is_like_clang() { + // AWS-LC-FIPS 2.0 was unable to compile with Clang 19 emit_warning(&format!("Clang v{major}.{minor}.{patch} detected.")); - if major > 18 { - // TODO: Update when FIPS Clang 19 build is fixed - emit_warning("WARNING: FIPS build is known to fail on Clang >= 19. See: https://github.com/aws/aws-lc-rs/issues/569"); - return Some(false); - } } return Some(true); } @@ -425,7 +421,7 @@ impl crate::Builder for CmakeBuilder { } fn parse_version(line: &str) -> Option<(u32, u32, u32)> { - let version_pattern = regex::Regex::new(r"\s(\d{1,2})\.(\d{1,2})\.(\d+)").unwrap(); + let version_pattern = regex::Regex::new(r"\s(\d{1,2})\.(\d{1,2})\.(\d+)").ok()?; let captures = version_pattern.captures(line)?; let major_str = captures.get(1)?.as_str();