rb_sys 0.9.44 → 0.9.46

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7dc7cda8ec0b4b84fe72eafee24aa48c69a8bcded5713fa586baf7b3c076bf31
-  data.tar.gz: c714b3f4b84eb780fe1a57315e3d9546ed9202369c880c4fe983f3b435298c4e
+  metadata.gz: f77f084cfb03e13eb0357b3e63b0d8d516ff8e1fac6acf9c6bb98072668ca730
+  data.tar.gz: c3db1bd7e0886b182555ec81a539e6f91a5beaf172efb588b6efffd2733ad27b
 SHA512:
-  metadata.gz: dcb91faa9279bf86c4e057c235a8dcea72faa7870d694441d9dcd35614f5cb4979df1967ca1a8ea49dfc9662daf03799239cf549854ea174eec70f506500c4ab
-  data.tar.gz: f92e5fcb836a6b7acf483e5c4afde4809ec1bdd02e57f8d02c97cacfaa8d75423a83c6ebc4fc952449b750f59a886c215482fff389d766ff2b0c9aa91aa97a24
+  metadata.gz: f54a91c1e95826f61c1df74e5c971e8a41e9fa07a74759f1fb6e8ce854ec174e8097e178198a3d8319e0e192229fab54090ad20e1d1940b9fb9d92675a8ac6cf
+  data.tar.gz: 1926663702290069dec03533acb610090fac519c37c086e6ff3f52c0a8e70e9be21a960c3ce17e8ad81a2dccf7a90709dde6093e4cf642255c8aed03bee6d2d1

data/lib/rb_sys/mkmf/config.rb

@@ -4,13 +4,14 @@ module RbSys
   module Mkmf
     # Config that delegates to CargoBuilder if needded
     class Config
-      attr_accessor :force_install_rust_toolchain, :clean_after_install, :target_dir, :auto_install_rust_toolchain
+      attr_accessor :force_install_rust_toolchain, :clean_after_install, :target_dir, :auto_install_rust_toolchain, :rubygems_clean_dirs
 
       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"]
       end
 
       def cross_compiling?

data/lib/rb_sys/mkmf.rb

@@ -103,6 +103,7 @@ module RbSys
         CLEANOBJS = $(RUSTLIBDIR) $(RB_SYS_BUILD_DIR)
         DEFFILE = $(RB_SYS_CARGO_TARGET_DIR)/$(TARGET)-$(arch).def
         CLEANLIBS = $(DLLIB) $(RUSTLIB) $(DEFFILE)
+        RUBYGEMS_CLEAN_DIRS = $(CLEANOBJS) $(CLEANFILES) #{builder.rubygems_clean_dirs.join(" ")}
 
         #{base_makefile(srcdir)}
 
@@ -134,7 +135,8 @@ module RbSys
         \t$(INSTALL_PROG) $(DLLIB) $(RUBYARCHDIR)
 
         gemclean:
-        \t-$(Q)$(RM_RF) $(CLEANOBJS) $(CLEANFILES) 2> /dev/null || true
+        \t$(ECHO) Cleaning gem artifacts
+        \t-$(Q)$(RM_RF) $(RUBYGEMS_CLEAN_DIRS) 2> /dev/null || true
 
         install: #{builder.clean_after_install ? "install-so gemclean" : "install-so"}
 
@@ -166,9 +168,9 @@ module RbSys
 
     def env_vars(builder)
       lines = builder.build_env.map { |k, v| env_line(k, v) }
-      lines << env_line("CC", env_or_makefile_config("CC"))
-      lines << env_line("CXX", env_or_makefile_config("CXX"))
-      lines << env_line("AR", env_or_makefile_config("AR")) unless env_or_makefile_config("AR") == "libtool -static"
+      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.compact.join("\n")
     end
 
@@ -177,6 +179,10 @@ module RbSys
       export_env(k, 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]
     end

data/lib/rb_sys/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rb_sys
 version: !ruby/object:Gem::Version
-  version: 0.9.44
+  version: 0.9.46
 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: 2022-11-18 00:00:00.000000000 Z
+date: 2022-12-05 00:00:00.000000000 Z
 dependencies: []
 description:
 email: