run-make-support: add build_native_static_lib_cxx_optimized helper

These should eventually be cleaned up, but let's add a helper for the
immediate need of porting the `cpp_smoke_test` test.

Author: jieyouxu

src/tools/run-make-support/src/external_deps/c_build.rs

@@ -6,7 +6,8 @@ use crate::external_deps::llvm::llvm_ar;
 use crate::path_helpers::path;
 use crate::targets::{is_darwin, is_msvc, is_windows};
 
-// FIXME(Oneirical): These native build functions should take a Path-based generic.
+// FIXME(jieyouxu): figure out a way to improve the usability of these helpers... They are really
+// messy.
 
 /// Builds a static lib (`.lib` on Windows MSVC and `.a` for the rest) with the given name.
 /// Built from a C file.
@@ -75,8 +76,8 @@ pub fn build_native_dynamic_lib(lib_name: &str) -> PathBuf {
     path(lib_path)
 }
 
-/// Builds a static lib (`.lib` on Windows MSVC and `.a` for the rest) with the given name.
-/// Built from a C++ file.
+/// Builds a static lib (`.lib` on Windows MSVC and `.a` for the rest) with the given name. Built
+/// from a C++ file. Unoptimized.
 #[track_caller]
 pub fn build_native_static_lib_cxx(lib_name: &str) -> PathBuf {
     let obj_file = if is_msvc() { format!("{lib_name}") } else { format!("{lib_name}.o") };
@@ -95,3 +96,35 @@ pub fn build_native_static_lib_cxx(lib_name: &str) -> PathBuf {
     llvm_ar().obj_to_ar().output_input(&lib_path, &obj_file).run();
     path(lib_path)
 }
+
+/// Builds a static lib (`.lib` on Windows MSVC and `.a` for the rest) with the given name. Built
+/// from a C++ file. Optimized with the provided `opt_level` flag. Note that the `opt_level_flag`
+/// can differ between different C++ compilers! Consult relevant docs for `g++`/`clang++`/MSVC.
+#[track_caller]
+pub fn build_native_static_lib_cxx_optimized(lib_name: &str, opt_level_flag: &str) -> PathBuf {
+    let obj_file = if is_msvc() { format!("{lib_name}") } else { format!("{lib_name}.o") };
+    let src = format!("{lib_name}.cpp");
+    let lib_path = static_lib_name(lib_name);
+
+    // NOTE: generate debuginfo
+    if is_msvc() {
+        cxx()
+            .arg(opt_level_flag)
+            .arg("-Zi")
+            .arg("-debug")
+            .arg("-EHs")
+            .arg("-c")
+            .out_exe(&obj_file)
+            .input(src)
+            .run();
+    } else {
+        cxx().arg(opt_level_flag).arg("-g").arg("-c").out_exe(&obj_file).input(src).run();
+    };
+    let obj_file = if is_msvc() {
+        PathBuf::from(format!("{lib_name}.obj"))
+    } else {
+        PathBuf::from(format!("{lib_name}.o"))
+    };
+    llvm_ar().obj_to_ar().output_input(&lib_path, &obj_file).run();
+    path(lib_path)
+}

src/tools/run-make-support/src/lib.rs

@@ -37,6 +37,7 @@ pub mod rfs {
 // Re-exports of third-party library crates.
 // tidy-alphabetical-start
 pub use bstr;
+pub use cc as crate_cc; // NOTE: aliased to avoid being confused with `c_cxx_compiler::cc`.
 pub use gimli;
 pub use libc;
 pub use object;
@@ -55,7 +56,7 @@ pub use external_deps::{
 pub use c_cxx_compiler::{Cc, Gcc, cc, cxx, extra_c_flags, extra_cxx_flags, gcc};
 pub use c_build::{
     build_native_dynamic_lib, build_native_static_lib, build_native_static_lib_cxx,
-    build_native_static_lib_optimized,
+    build_native_static_lib_optimized, build_native_static_lib_cxx_optimized,
 };
 pub use cargo::cargo;
 pub use clang::{clang, Clang};