rb_sys 0.9.36 → 0.9.38

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 597f75a81d483edd85cc5bf1a09be027d4b612dff53ed6f2ecb1818230aaa1ff
-  data.tar.gz: 7c4a90b0a9f13a310c30b3e5366949e8d4d50cc9b44c05e005d65b39b24fa7ee
+  metadata.gz: 7d4ca0e7a03a649cabcf365abb97e67a56dfe2cb9517597a179f5f6f8cd89de7
+  data.tar.gz: 1a4a6e2f26fe766ed781270cc8bed950d6a0c4f510a8e442cc5649f40dea2a8f
 SHA512:
-  metadata.gz: a31f920df196e7c39fc232ee27c437f5fcbaff163675f57a931761ec1f6ee8f2c8c9659e346a3b6b7559a2ce263d0ebe2b8fd5a00fd5667aeab9d0e21aaf97a5
-  data.tar.gz: d00f112746b3b056c98a1480e7c172c6b0a877042f7430a549bfa9d2114057a9bb6e90294385b5af6684358893715412ebeb7a4aa3d1ef970e7e4cf939ec7bc6
+  metadata.gz: 49dbba58b16a1a47fe7616bc6ee866b64cdf474b385ff9dc73d584877ba4b70203f195fafd91614c76fffd04bb4b6ba59002f1290e60372ddb9917a5ce97cf94
+  data.tar.gz: 8eea32117820b1b9c03b5c88732fa5071e20cde66a9cdbfe4af7d11d741b2d112bdce0bd27ca727828b5c106c619ce7177eaf015b843a525455d5356713b5828

data/lib/rb_sys/cargo_builder.rb

@@ -131,7 +131,6 @@ module RbSys
     # We want to use the same linker that Ruby uses, so that the linker flags from
     # mkmf work properly.
     def linker_args
-      # Have to handle CC="cl /nologo" on mswin
       cc_flag = Shellwords.split(makefile_config("CC"))
       linker = cc_flag.shift
       link_args = cc_flag.flat_map { |a| ["-C", "link-arg=#{a}"] }
@@ -142,8 +141,11 @@ module RbSys
     end
 
     def mswin_link_args
-      libruby = ruby_static? ? makefile_config("LIBRUBY_A") : makefile_config("LIBRUBY")
-      ["-C", "link-arg=#{libruby}"]
+      args = []
+      args += ["-l", makefile_config("LIBRUBYARG_SHARED").chomp(".lib")]
+      args += split_flags("LIBS").flat_map { |lib| ["-l", lib.chomp(".lib")] }
+      args += split_flags("LOCAL_LIBS").flat_map { |lib| ["-l", lib.chomp(".lib")] }
+      args
     end
 
     def libruby_args(dest_dir)

data/lib/rb_sys/mkmf.rb

@@ -10,6 +10,8 @@ require_relative "mkmf/config"
 module RbSys
   # Helper class for creating Rust Makefiles
   module Mkmf
+    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.
@@ -62,6 +64,7 @@ module RbSys
 
         #{conditional_assign("RB_SYS_CARGO_PROFILE", builder.profile)}
         #{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(" "))}
 
         # Set dirname for the profile, since the profiles do not directly map to target dir (i.e. dev -> debug)
@@ -105,7 +108,7 @@ module RbSys
         #{endif_stmt}
 
         #{env_vars(builder)}
-        #{export_env("RUSTFLAGS", "$(RUSTFLAGS) $(RB_SYS_EXTRA_RUSTFLAGS)")}
+        #{export_env("RUSTFLAGS", "$(RB_SYS_GLOBAL_RUSTFLAGS) $(RB_SYS_EXTRA_RUSTFLAGS) $(RUSTFLAGS)")}
 
         FORCE: ;
 
@@ -113,13 +116,11 @@ module RbSys
         \t$(ECHO) creating target directory \\($(@)\\)
         \t$(Q) $(MAKEDIRS) $(TARGET_DIR)
 
-        $(DEFFILE): $(TARGET_DIR)
-        \t$(ECHO) generating $(@)
-        \t$(Q) ($(COPY) $(srcdir)/$(TARGET).def $@ 2> /dev/null) || (echo EXPORTS && echo $(TARGET_ENTRY)) > $@
+        #{deffile_definition}
 
         #{optional_rust_toolchain(builder)}
 
-        $(RUSTLIB): $(DEFFILE) FORCE
+        $(RUSTLIB): #{deffile_definition ? "$(DEFFILE) " : nil}FORCE
         \t$(ECHO) generating $(@) \\("$(RB_SYS_CARGO_PROFILE)"\\)
         \t$(Q) #{full_cargo_command}
 
@@ -185,6 +186,18 @@ module RbSys
       cargo_command
     end
 
+    def deffile_definition
+      warn("EXPORT_PREFIX is not defined, please require \"mkmf\" before requiring \"rb_sys/mkmf\"") unless defined?(EXPORT_PREFIX)
+
+      return unless defined?(EXPORT_PREFIX) && EXPORT_PREFIX
+
+      @deffile_definition ||= <<~MAKE
+        $(DEFFILE): $(TARGET_DIR)
+        \t$(ECHO) generating $(@)
+        \t$(Q) ($(COPY) $(srcdir)/$(TARGET).def $@ 2> /dev/null) || (echo EXPORTS && echo $(TARGET_ENTRY)) > $@
+      MAKE
+    end
+
     def optional_rust_toolchain(builder)
       <<~MAKE
         #{conditional_assign("RB_SYS_FORCE_INSTALL_RUST_TOOLCHAIN", builder.force_install_rust_toolchain)}

data/lib/rb_sys/version.rb

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

metadata

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