rb_sys 0.9.76 → 0.9.78

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c79e94963bafba1b586eedc8c4bf6c7c946b3940a0c7bc097cae7d04040403e5
-  data.tar.gz: f6f9c2b94b7311b976ef215080955bf77f8684ba0d17548c83bd03d6bdde7683
+  metadata.gz: 8fb42bed92543f08d6a3225a194387d67671a18152815470b835b12bc2406411
+  data.tar.gz: e9fe146231fe531643428f3bc2c4b7376fcf883fb1b8adc400bff361379be9e3
 SHA512:
-  metadata.gz: 7887dbf95e017f3cc0be4d430574dad5d53ef3deb5f1809027a4d9b92a02be5f19e0b2f9dba449b9fcbd17089b044bc202ef39c9be20345522988e73ab65d9c4
-  data.tar.gz: 98e18fa3cb80075f935b874f8e7b5ca6bd13b6d9bf0134e4fc9df18d180ae363a2461a82891f860d557eb5e943267fd7ecc397e2a25a04dac4b9426dc36f9e86
+  metadata.gz: b31316a3201a77e5960bf33ce5b9e59bb1fdf24bd31a6f5eebf9103938d0adee6cca5f9cd3a84813e3f24b9519676467fb649b45788487ab607af9b54c3a018e
+  data.tar.gz: cae3aaeead61b81af09bfcb5d77f79e9db5ce1f5863273c7ba230cb5dc7a0db34dce910692d453fab187d57ef7c233da43441e2537733ec2937158540a95cb0c

data/lib/rb_sys/mkmf.rb

@@ -80,12 +80,8 @@ module RbSys
         #{conditional_assign("RB_SYS_CARGO_PROFILE_DIR", "$(RB_SYS_CARGO_PROFILE)", indent: 1)}
         #{endif_stmt}
 
-        # Set the build profile (dev, release, etc.) Compat with Rust 1.54.
-        #{if_eq_stmt("$(RB_SYS_CARGO_PROFILE)", "release")}
-        #{assign_stmt("RB_SYS_CARGO_PROFILE_FLAG", "--release", indent: 1)}
-        #{else_stmt}
+        # Set the build profile (dev, release, etc.).
         #{assign_stmt("RB_SYS_CARGO_PROFILE_FLAG", "--profile $(RB_SYS_CARGO_PROFILE)", indent: 1)}
-        #{endif_stmt}
 
         # Account for sub-directories when using `--target` argument with Cargo
         #{conditional_assign("RB_SYS_CARGO_TARGET_DIR", "target")}
@@ -177,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:)
@@ -332,8 +339,8 @@ module RbSys
         raise "libclang version 5.0.0 or greater is required (current #{libclang_version})"
       end
 
-      if libclang_version >= Gem::Version.new("15.0.0")
-        raise "libclang version > 14.0.0 or greater is required (current #{libclang_version})"
+      if libclang_version >= Gem::Version.new("17.0.0")
+        raise "libclang version < 17.0.0 or greater is required (current #{libclang_version})"
       end
     end
 

data/lib/rb_sys/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rb_sys
 version: !ruby/object:Gem::Version
-  version: 0.9.76
+  version: 0.9.78
 platform: ruby
 authors:
 - Ian Ker-Seymer
@@ -30,7 +30,7 @@ cert_chain:
   DIZ6NVmpBvohJVCCCDxQQxFKLXZp1ivoxjN+m7eJSW7yzIz062pH4u8pPNQsiVSb
   I5rgRPbDr2rAFGXKoQ0+u6CLkRxqrVsITl/OPfZhBQI=
   -----END CERTIFICATE-----
-date: 2023-05-09 00:00:00.000000000 Z
+date: 2023-05-23 00:00:00.000000000 Z
 dependencies: []
 description:
 email: