Rust: Add "clib" crate type

Author: xclaesse

docs/markdown/snippets/rust_crate_type.md

@@ -0,0 +1,4 @@
+## New `clib` value for `rust_crate_type`
+
+Similar to `lib` value but for building a C ABI static or shared library
+depending on the value of `default_library` when using `library()`.

docs/yaml/functions/_build_target_base.yaml

@@ -292,16 +292,17 @@ kwargs:
       If the target is an [[executable]] this defaults to "bin", the only
       allowed value.
 
-      If it is a [[static_library]] it defaults to "lib", and may be "lib",
-      "staticlib", or "rlib". If "lib" then Rustc will pick a default, "staticlib"
-      means a C ABI library, "rlib" means a Rust ABI.
+      If it is a [[static_library]] it defaults to "lib", and may be "lib", "clib"
+      "staticlib", or "rlib". "clib" and "staticlib" means a C ABI library,
+      "lib" and "rlib" means a Rust ABI.
 
-      If it is a [[shared_library]] it defaults to "lib", and may be "lib",
-      "dylib", "cdylib", or "proc-macro". If "lib" then Rustc will pick a
-      default, "cdylib" means a C ABI library, "dylib" means a Rust ABI, and
-      "proc-macro" is a special rust procedural macro crate.
+      If it is a [[shared_library]] it defaults to "lib", and may be "lib", "clib",
+      "dylib", "cdylib", or "proc-macro". "clib" and "cdylib" means a C ABI library,
+      "lib" and "dylib" means a Rust ABI, and "proc-macro" is a special rust
+      procedural macro crate.
 
       "proc-macro" is new in 0.62.0.
+      "clib" is new in 1.2.0.
 
   rust_dependency_map:
     type: dict[str]

mesonbuild/build.py

@@ -1244,6 +1244,8 @@ def process_kwargs(self, kwargs):
             raise InvalidArguments(f'Invalid rust_crate_type "{rust_crate_type}": must be a string.')
         if self.rust_crate_type == 'proc-macro':
             FeatureNew.single_use('Rust crate type "proc-macro"', '0.62.0', self.subproject)
+        if self.rust_crate_type == 'clib':
+            FeatureNew.single_use('Rust crate type "clib"', '1.2.0', self.subproject)
 
         rust_dependency_map = kwargs.get('rust_dependency_map', {})
         if not isinstance(rust_dependency_map, dict):
@@ -2001,6 +2003,8 @@ def post_init(self) -> None:
             if self.rust_crate_type == 'lib':
                 mlog.debug('Defaulting Rust static library target crate type to rlib')
                 self.rust_crate_type = 'rlib'
+            elif self.rust_crate_type == 'clib':
+                self.rust_crate_type = 'staticlib'
             # Don't let configuration proceed with a non-static crate type
             elif self.rust_crate_type not in {'rlib', 'staticlib'}:
                 raise InvalidArguments(f'Crate type "{self.rust_crate_type}" invalid for static libraries; must be "rlib" or "staticlib"')
@@ -2086,6 +2090,8 @@ def post_init(self) -> None:
             if self.rust_crate_type == 'lib':
                 mlog.debug('Defaulting Rust dynamic library target crate type to "dylib"')
                 self.rust_crate_type = 'dylib'
+            elif self.rust_crate_type == 'clib':
+                self.rust_crate_type = 'cdylib'
             # Don't let configuration proceed with a non-dynamic crate type
             elif self.rust_crate_type not in {'dylib', 'cdylib', 'proc-macro'}:
                 raise InvalidArguments(f'Crate type "{self.rust_crate_type}" invalid for dynamic libraries; must be "dylib", "cdylib", or "proc-macro"')