rb_sys 0.9.77 → 0.9.79

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b31464c40e0238817da236bfbc3890d604ee772304c1e0186ab61942ff2cb72b
-  data.tar.gz: 4a23bcaf4d11ac382a0a6ee1c1e9aafd8725087ef1e2520e53d3713fbb0a5c91
+  metadata.gz: 63c63786ecd9f735f17132c8f772cb145d0c4107052d482ea5cff7084f30a7c5
+  data.tar.gz: 5d2f9d6e902e855805367f7cdba4a80953693c7a979b58593eca572d310c0cf6
 SHA512:
-  metadata.gz: ede98c88f6793cb94f365b7106bcc8253c967e28205ebd73aecc166f95bf37f34c350490548cd39c61fb5f70f60937a73a39ec5ffe57352b0e5eb9bd67cd1627
-  data.tar.gz: 046e69a7794b381560e40ee845b9ec1efeaa454977323737793819bd3149580f355d2f415447962147daf084de2af5347f3a80a0ede635393aec4fb7bcd5f9a1
+  metadata.gz: 1653a68b2336d328c855c0ce972668d67461b3c5aeb4d15f76a69377f72ff76b21f85b0fc1da73ce491fff4965b6378ac7c7742018b9263a91ec40f34719bda3
+  data.tar.gz: 8cbae235b072bd6a68980a4159fd13ea8f7168b4fc760d834371a62bfb1677ded0e1932334204b97ed45004d9baba1c3f0364ae671c5b4f9ceb012fd03bd3237

checksums.yaml.gz.sig

@@ -1 +1,2 @@
-p�������n�����$���#�k�a�cWw��� �M�ث�� ���r��t�w7�(�zU`N��r�<��-,81�6������e*F1&��cJL��~�����Ӂ�t.8�[Zˉ�{S�R�������l^V�$�{�o0�ׄtb��>@oa�ş��߉#�-��kK�.��Jx��
��r����>�دv�W�_]�,�_G+�rÂt�bC
+`��u�s���V`b,�r�S�LDI*N���V���Tk�+�z2?��`�ٱ>���oR��W��?.�cXLv��7D�Լ�Ҫ�+��g���Ħ��t���pW�v�q����k��*'���/P8`��%{>*>}}�z\H���x.QN����B��n_HV�W,�;�ڷ��H��)���a��aVB(Q�{'c5XºN��v��KG{v�8�o���g�i_#B�
+��-c������I��M��ô��
C�مK~�w�_S�W

data/lib/rb_sys/mkmf/config.rb

@@ -19,12 +19,16 @@ module RbSys
       # Directories to clean after installing with Rubygems
       attr_accessor :rubygems_clean_dirs
 
+      # Extra targets to install
+      attr_accessor :extra_rustup_targets
+
       def initialize(builder)
         @builder = builder
         @force_install_rust_toolchain = false
         @auto_install_rust_toolchain = true
         @clean_after_install = rubygems_invoked?
         @rubygems_clean_dirs = ["./cargo-vendor"]
+        @extra_rustup_targets = []
       end
 
       # @api private

data/lib/rb_sys/mkmf.rb

@@ -173,24 +173,35 @@ module RbSys
     end
 
     def env_vars(builder)
-      lines = builder.build_env.map { |k, v| env_line(k, v) }
-      lines << env_line("CC", strip_cmd(env_or_makefile_config("CC")))
-      lines << env_line("CXX", strip_cmd(env_or_makefile_config("CXX")))
-      lines << env_line("AR", strip_cmd(env_or_makefile_config("AR"))) unless env_or_makefile_config("AR") == "libtool -static"
+      lines = []
+
+      if (cc = env_or_makefile_config("CC", builder)) && find_executable(cc)
+        lines << assign_stmt("CC", cc)
+      end
+
+      if (cxx = env_or_makefile_config("CXX", builder)) && find_executable(cxx)
+        lines << assign_stmt("CXX", cxx)
+      end
+
+      if (ar = env_or_makefile_config("AR", builder)) && find_executable(ar)
+        lines << assign_stmt("AR", ar)
+      end
+
+      lines += builder.build_env.map { |k, v| env_line(k, v) }
       lines.compact.join("\n")
     end
 
     def env_line(k, v)
       return unless v
-      export_env(k, v.gsub("\n", '\n'))
+      export_env(k, strip_cmd(v.gsub("\n", '\n')))
     end
 
     def strip_cmd(cmd)
       cmd.gsub("-nologo", "").strip
     end
 
-    def env_or_makefile_config(key)
-      ENV[key] || RbConfig::MAKEFILE_CONFIG[key]
+    def env_or_makefile_config(key, builder)
+      builder.env[key] || ENV[key] || RbConfig::MAKEFILE_CONFIG[key]
     end
 
     def gsub_cargo_command!(cargo_command, builder:)
@@ -242,12 +253,19 @@ module RbSys
         \t$(Q) curl --proto '=https' --tlsv1.2 --retry 10 --retry-connrefused -fsSL "https://sh.rustup.rs" | sh -s -- --no-modify-path --profile $(RB_SYS_RUSTUP_PROFILE) --default-toolchain none -y
         \t$(Q) $(CARGO_HOME)/bin/rustup toolchain install $(RB_SYS_DEFAULT_TOOLCHAIN) --profile $(RB_SYS_RUSTUP_PROFILE)
         \t$(Q) $(CARGO_HOME)/bin/rustup default $(RB_SYS_DEFAULT_TOOLCHAIN)
+        #{install_extra_rustup_targets(builder)}
 
         $(RUSTLIB): $(CARGO)
         #{endif_stmt}
       MAKE
     end
 
+    def install_extra_rustup_targets(builder)
+      builder.extra_rustup_targets.map do |target|
+        "\t$(Q) $(CARGO_HOME)/bin/rustup target add #{target}"
+      end.join("\n")
+    end
+
     def force_install_rust_toolchain?(builder)
       return builder.force_install_rust_toolchain if builder.force_install_rust_toolchain
       return false unless builder.rubygems_invoked? && builder.auto_install_rust_toolchain

data/lib/rb_sys/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rb_sys
 version: !ruby/object:Gem::Version
-  version: 0.9.77
+  version: 0.9.79
 platform: ruby
 authors:
 - Ian Ker-Seymer
@@ -30,7 +30,7 @@ cert_chain:
   DIZ6NVmpBvohJVCCCDxQQxFKLXZp1ivoxjN+m7eJSW7yzIz062pH4u8pPNQsiVSb
   I5rgRPbDr2rAFGXKoQ0+u6CLkRxqrVsITl/OPfZhBQI=
   -----END CERTIFICATE-----
-date: 2023-05-10 00:00:00.000000000 Z
+date: 2023-06-13 00:00:00.000000000 Z
 dependencies: []
 description:
 email:
@@ -82,7 +82,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.6
+rubygems_version: 3.4.10
 signing_key:
 specification_version: 4
 summary: Helpers for compiling Rust extensions for ruby