From cd0ab51e1e6a49a52c8fafa79185048fc2e49048 Mon Sep 17 00:00:00 2001
From: Honsun Zhu <honsun@linux.com>
Date: Wed, 12 Nov 2025 10:35:16 +0800
Subject: [PATCH] Make aws-lc-fips-sys's config CMAKE_BUILD_TYPE logic same
 with aws-lc-sys

---
 aws-lc-fips-sys/builder/cmake_builder.rs | 51 ++++++++++--------------
 1 file changed, 21 insertions(+), 30 deletions(-)

diff --git a/aws-lc-fips-sys/builder/cmake_builder.rs b/aws-lc-fips-sys/builder/cmake_builder.rs
index 22f2d197f79..8ca91c6a33b 100644
--- a/aws-lc-fips-sys/builder/cmake_builder.rs
+++ b/aws-lc-fips-sys/builder/cmake_builder.rs
@@ -121,46 +121,37 @@ impl CmakeBuilder {
         }
 
         let cc_build = cc::Build::new();
-        let opt_level = cargo_env("OPT_LEVEL");
-        if opt_level.ne("0") {
-            if opt_level.eq("1") || opt_level.eq("2") {
-                cmake_cfg.define("CMAKE_BUILD_TYPE", "relwithdebinfo");
-            } else {
-                if opt_level.eq("s") || opt_level.eq("z") {
-                    cmake_cfg.define("CMAKE_BUILD_TYPE", "minsizerel");
-                } else {
-                    cmake_cfg.define("CMAKE_BUILD_TYPE", "release");
-                }
-                // TODO: Due to the nature of the FIPS build (e.g., its dynamic generation of
-                // assembly files and its custom compilation commands within CMake), not all
-                // source paths are stripped from the resulting binary.
-                emit_warning(
-                    "NOTICE: Build environment source paths might be visible in release binary.",
-                );
-                if let Some(parent_dir) = self.manifest_dir.parent() {
-                    if target_family() == "unix" || target_env() == "gnu" {
-                        let flag = format!("\"-ffile-prefix-map={}=\"", parent_dir.display());
+        let cmake_prefile = cmake_cfg.get_profile();
+        if matches!(cmake_prefile, "Release" | "MinSizeRel") {
+            // TODO: Due to the nature of the FIPS build (e.g., its dynamic generation of
+            // assembly files and its custom compilation commands within CMake), not all
+            // source paths are stripped from the resulting binary.
+            emit_warning(
+                "NOTICE: Build environment source paths might be visible in release binary.",
+            );
+            if let Some(parent_dir) = self.manifest_dir.parent() {
+                if target_family() == "unix" || target_env() == "gnu" {
+                    let flag = format!("\"-ffile-prefix-map={}=\"", parent_dir.display());
+                    if let Ok(true) = cc_build.is_flag_supported(&flag) {
+                        emit_warning(&format!("Using flag: {}", &flag));
+                        cmake_cfg.asmflag(&flag);
+                        cmake_cfg.cflag(&flag);
+                    } else {
+                        let flag = format!("\"-fdebug-prefix-map={}=\"", parent_dir.display());
                         if let Ok(true) = cc_build.is_flag_supported(&flag) {
                             emit_warning(&format!("Using flag: {}", &flag));
                             cmake_cfg.asmflag(&flag);
                             cmake_cfg.cflag(&flag);
-                        } else {
-                            let flag = format!("\"-fdebug-prefix-map={}=\"", parent_dir.display());
-                            if let Ok(true) = cc_build.is_flag_supported(&flag) {
-                                emit_warning(&format!("Using flag: {}", &flag));
-                                cmake_cfg.asmflag(&flag);
-                                cmake_cfg.cflag(&flag);
-                            }
                         }
                     }
                 }
             }
-        } else if target_os() == "windows" {
+        }
+
+        if target_os() == "windows" {
             // The Windows/FIPS build rejects "debug" profile
             // https://github.com/aws/aws-lc/blob/main/CMakeLists.txt#L656
-            cmake_cfg.define("CMAKE_BUILD_TYPE", "relwithdebinfo");
-        } else {
-            cmake_cfg.define("CMAKE_BUILD_TYPE", "debug");
+            cmake_cfg.profile("RelWithDebInfo");
         }
 
         if is_crt_static() {