rb_sys 0.9.57 → 0.9.59

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 27a227f5ee01ad075732f0cad76c1f5c470ca2ade4cb8e88e38b0c520d2d213f
-  data.tar.gz: ab2464fcc5d2ae8bbe614cacbf660ecb6b919623e117c3cb7739ba48b9fdd6ea
+  metadata.gz: 0d0c1e0630a88954cda754dbb7db45842203cacd6fd265ea75a0424989d66e34
+  data.tar.gz: 94d12fe7fe913ffb00ac9343a3ab594e3701d82f99fda2ab99a79e654bd4259e
 SHA512:
-  metadata.gz: bc667a8b467591923c10f6bc18984723474fe4bebdd6d24e86513f876f7c1e4bdb869f534fa6809dc576a3be9fb4e3f79bb79113a0ecbede9ab397b9637af673
-  data.tar.gz: ac3f9e12f3fa0e3d1946dd954d8fd6d3549e30e43717e627db0689b963ceee703f6d71f6ec5653ba42058a4ea7793de48722909185b2893fdeff495d7a8ff6ff
+  metadata.gz: 618d433d7992df2fab66bdeb03204d0e699a4594881bc48bd61a4c5359b94eb25f26fd0eb9f2cd57038d4130c125383069267e125edc92d5761ef920ae3a6d87
+  data.tar.gz: 1d6aa9c2039dffc0093bed770be24703f88ec95164ad87d24913e1889e9697206a1ef461e405f57ef1b56e02f505b7dc86e36839d8df7a1f972aa8973b94b186

data/lib/rb_sys/cargo_builder/link_flag_converter.rb

@@ -7,7 +7,8 @@ module RbSys
     # Converts Ruby link flags into something cargo understands
     class LinkFlagConverter
       FILTERED_PATTERNS = [
-        /compress-debug-sections/ # Not supported by all linkers, and not required for Rust
+        /compress-debug-sections/, # Not supported by all linkers, and not required for Rust
+        /^\s*-s\s*$/
       ]
 
       def self.convert(args)

data/lib/rb_sys/cargo_builder.rb

@@ -1,9 +1,12 @@
+require "rubygems/ext"
+require "rubygems/ext/builder"
 require_relative "cargo_builder/link_flag_converter"
 
 module RbSys
   # A class to build a Ruby gem Cargo. Extracted from `rubygems` gem, with some modifications.
   class CargoBuilder < Gem::Ext::Builder
-    attr_accessor :spec, :runner, :env, :features, :target, :extra_rustc_args, :dry_run, :ext_dir, :extra_rustflags
+    attr_accessor :spec, :runner, :env, :features, :target, :extra_rustc_args, :dry_run, :ext_dir, :extra_rustflags,
+      :extra_cargo_args
     attr_writer :profile
 
     def initialize(spec)
@@ -17,6 +20,7 @@ module RbSys
       @features = []
       @target = ENV["CARGO_BUILD_TARGET"] || ENV["RUST_TARGET"]
       @extra_rustc_args = []
+      @extra_cargo_args = []
       @dry_run = true
       @ext_dir = nil
       @extra_rustflags = []
@@ -68,7 +72,7 @@ module RbSys
       cmd += Gem::Command.build_args
       cmd += args
       cmd += ["--"]
-      cmd += [*cargo_rustc_args(dest_path)]
+      cmd += [*rustc_args(dest_path)]
       cmd += extra_rustc_args
       cmd
     end
@@ -105,7 +109,7 @@ module RbSys
       result
     end
 
-    def cargo_rustc_args(dest_dir)
+    def rustc_args(dest_dir)
       [
         *linker_args,
         *mkmf_libpath,

data/lib/rb_sys/mkmf.rb

@@ -68,6 +68,7 @@ module RbSys
         #{conditional_assign("RB_SYS_CARGO_FEATURES", builder.features.join(","))}
         #{conditional_assign("RB_SYS_GLOBAL_RUSTFLAGS", GLOBAL_RUSTFLAGS.join(" "))}
         #{conditional_assign("RB_SYS_EXTRA_RUSTFLAGS", builder.extra_rustflags.join(" "))}
+        #{conditional_assign("RB_SYS_EXTRA_CARGO_ARGS", builder.extra_cargo_args.join(" "))}
 
         # Set dirname for the profile, since the profiles do not directly map to target dir (i.e. dev -> debug)
         #{if_eq_stmt("$(RB_SYS_CARGO_PROFILE)", "dev")}
@@ -163,7 +164,11 @@ module RbSys
       args = ARGV.dup
       args.shift if args.first == "--"
       cargo_cmd = builder.cargo_command(dest_path, args)
-      Shellwords.join(cargo_cmd).gsub("\\=", "=").gsub(/\Acargo/, "$(CARGO)").gsub(/-v=\d/, "")
+      cmd = Shellwords.join(cargo_cmd)
+      cmd.gsub!("\\=", "=")
+      cmd.gsub!(/\Acargo rustc/, "$(CARGO) rustc $(RB_SYS_EXTRA_CARGO_ARGS)")
+      cmd.gsub!(/-v=\d/, "")
+      cmd
     end
 
     def env_vars(builder)

data/lib/rb_sys/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rb_sys
 version: !ruby/object:Gem::Version
-  version: 0.9.57
+  version: 0.9.59
 platform: ruby
 authors:
 - Ian Ker-Seymer
@@ -30,7 +30,7 @@ cert_chain:
   Rl+ASkq2/1i07TkBpCf+2hq66+h/hx+/Y/KrUzXfe0jtvil0WESkJT2kqRqHWNhD
   9GKBxaQlXokNDtWCm1/gl6cD8WRZ0N5S4ZGJT1FLLsA=
   -----END CERTIFICATE-----
-date: 2023-01-20 00:00:00.000000000 Z
+date: 2023-02-01 00:00:00.000000000 Z
 dependencies: []
 description:
 email: