rb_sys 0.9.89 → 0.9.90

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b63d2f66b32950cf95f91a0ae43183917d140d45468d01c23fbdf90e60c96c89
-  data.tar.gz: c2fad00ab79f9828c4396d8b20240486823efc448905e3bd27933583021a197c
+  metadata.gz: a0e42cff7eb770ac1e6b766aed23ee13e855a24997a1e27dafc2bee51d72bddc
+  data.tar.gz: 838a06f80a5304b65fdc590d5a6623b5b3fd64bc230983cecdc6f98035c7ed4f
 SHA512:
-  metadata.gz: 7dc2d83125329bd25952494f1b552ee083cef1f5dacab99ca79df61baae0d7386505a5ad624824d07201f17c5406c735503e848c7f2eb5aa8b4a7c4710c52b58
-  data.tar.gz: c6048e23429dada10c8ce6b40a55bf2d6a6795c60ba8bbf4a4728e402ecc8ca666e6c52588636e68f1d730fc16d1b3db165db45af90b47198bc1bb4708ba4ad1
+  metadata.gz: eeda0d5cc55d4b17469bbd46ec3ff24b3871e9a085abccdaaa3b4c92f06ea8220356e88513c170ca3603ef276fa7721076d33c629d7e843d4e5e171763a0ce4f
+  data.tar.gz: c6fe283eb1a6f43e5e1e60c32c6a3e9a0098b46b0f96dba64477656237d7dd59d182ab32f4c2ee6a599f7cb4f914e314cb14ee3d9071369bde998485b999bc06

data/lib/rb_sys/cargo_builder.rb

@@ -9,7 +9,7 @@ module RbSys
     WELL_KNOWN_WRAPPERS = %w[sccache cachepot].freeze
 
     attr_accessor :spec, :runner, :env, :features, :target, :extra_rustc_args, :dry_run, :ext_dir, :extra_rustflags,
-      :extra_cargo_args
+      :extra_cargo_args, :config
     attr_writer :profile
 
     def initialize(spec)
@@ -66,7 +66,11 @@ module RbSys
 
     def cargo_command(dest_path, args = [])
       cmd = []
-      cmd += ["cargo", "rustc"]
+      cmd += if config.use_cargo_build
+        ["cargo", "build"]
+      else
+        ["cargo", "rustc"]
+      end
       cmd += ["--target", target] if target
       cmd += ["--target-dir", dest_path]
       cmd += ["--features", features.join(",")] unless features.empty?
@@ -74,9 +78,11 @@ module RbSys
       cmd += ["--profile", profile.to_s]
       cmd += Gem::Command.build_args
       cmd += args
-      cmd += ["--"]
-      cmd += [*rustc_args(dest_path)]
-      cmd += extra_rustc_args
+      if !config.use_cargo_build
+        cmd += ["--"]
+        cmd += [*rustc_args(dest_path)]
+        cmd += extra_rustc_args
+      end
       cmd
     end
 

data/lib/rb_sys/mkmf/config.rb

@@ -25,8 +25,13 @@ module RbSys
       # Use compiled C code fallback for stable API for ruby-head (default: false)
       attr_accessor :use_stable_api_compiled_fallback
 
+      # Instead of the default `cargo rustc` behaviour, just call `cargo build`.
+      # Requires manually setting relevant rb-sys environment (default: false)
+      attr_accessor :use_cargo_build
+
       def initialize(builder)
         @builder = builder
+        @builder.config = self
         @force_install_rust_toolchain = false
         @auto_install_rust_toolchain = true
         @use_stable_api_compiled_fallback = false

data/lib/rb_sys/mkmf.rb

@@ -10,9 +10,6 @@ require_relative "mkmf/config"
 module RbSys
   # Helper class for creating Rust Makefiles
   module Mkmf
-    # @api private
-    GLOBAL_RUSTFLAGS = ["--cfg=rb_sys_gem"]
-
     # Helper for building Rust extensions by creating a Ruby compatible makefile
     # for Rust. By using this class, your rust extension will be 100% compatible
     # with the rake-compiler gem, which allows for easy cross compilation.
@@ -53,7 +50,9 @@ module RbSys
       RbConfig.expand(srcdir = srcprefix.dup)
 
       full_cargo_command = cargo_command(srcdir, builder)
-      global_rustflags = GLOBAL_RUSTFLAGS.dup
+
+      global_rustflags = []
+      global_rustflags << "--cfg=rb_sys_gem" unless builder.use_cargo_build
       global_rustflags << "--cfg=rb_sys_use_stable_api_compiled_fallback" if builder.use_stable_api_compiled_fallback?
 
       make_install = +<<~MAKE
@@ -169,7 +168,11 @@ module RbSys
       cargo_cmd = builder.cargo_command(dest_path, args)
       cmd = Shellwords.join(cargo_cmd)
       cmd.gsub!("\\=", "=")
-      cmd.gsub!(/\Acargo rustc/, "$(CARGO) rustc $(RB_SYS_EXTRA_CARGO_ARGS) --manifest-path $(RB_SYS_CARGO_MANIFEST_DIR)/Cargo.toml")
+      if builder.use_cargo_build
+        cmd.gsub!(/\Acargo rustc/, "$(CARGO) build $(RB_SYS_EXTRA_CARGO_ARGS) --manifest-path $(RB_SYS_CARGO_MANIFEST_DIR)/Cargo.toml")
+      else
+        cmd.gsub!(/\Acargo rustc/, "$(CARGO) rustc $(RB_SYS_EXTRA_CARGO_ARGS) --manifest-path $(RB_SYS_CARGO_MANIFEST_DIR)/Cargo.toml")
+      end
       cmd.gsub!(/-v=\d/, "")
       cmd
     end

data/lib/rb_sys/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module RbSys
-  VERSION = "0.9.89"
+  VERSION = "0.9.90"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rb_sys
 version: !ruby/object:Gem::Version
-  version: 0.9.89
+  version: 0.9.90
 platform: ruby
 authors:
 - Ian Ker-Seymer
@@ -30,7 +30,7 @@ cert_chain:
   DIZ6NVmpBvohJVCCCDxQQxFKLXZp1ivoxjN+m7eJSW7yzIz062pH4u8pPNQsiVSb
   I5rgRPbDr2rAFGXKoQ0+u6CLkRxqrVsITl/OPfZhBQI=
   -----END CERTIFICATE-----
-date: 2024-02-24 00:00:00.000000000 Z
+date: 2024-03-01 00:00:00.000000000 Z
 dependencies: []
 description:
 email: