rb_sys 0.9.77 → 0.9.78

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b31464c40e0238817da236bfbc3890d604ee772304c1e0186ab61942ff2cb72b
-  data.tar.gz: 4a23bcaf4d11ac382a0a6ee1c1e9aafd8725087ef1e2520e53d3713fbb0a5c91
+  metadata.gz: 8fb42bed92543f08d6a3225a194387d67671a18152815470b835b12bc2406411
+  data.tar.gz: e9fe146231fe531643428f3bc2c4b7376fcf883fb1b8adc400bff361379be9e3
 SHA512:
-  metadata.gz: ede98c88f6793cb94f365b7106bcc8253c967e28205ebd73aecc166f95bf37f34c350490548cd39c61fb5f70f60937a73a39ec5ffe57352b0e5eb9bd67cd1627
-  data.tar.gz: 046e69a7794b381560e40ee845b9ec1efeaa454977323737793819bd3149580f355d2f415447962147daf084de2af5347f3a80a0ede635393aec4fb7bcd5f9a1
+  metadata.gz: b31316a3201a77e5960bf33ce5b9e59bb1fdf24bd31a6f5eebf9103938d0adee6cca5f9cd3a84813e3f24b9519676467fb649b45788487ab607af9b54c3a018e
+  data.tar.gz: cae3aaeead61b81af09bfcb5d77f79e9db5ce1f5863273c7ba230cb5dc7a0db34dce910692d453fab187d57ef7c233da43441e2537733ec2937158540a95cb0c

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
+��(�s�u��`��@���9��ԮX��������G��(��i���3��Ů��z}�	��Y�xb�7
+�u]�v*k�٫�D�e_�����\��\�G�-S�������.~�@�<J��N?}kz.Yϟ�����T�����H.t&K ���(o�]':F�W� (:7٩Ӊj���L�+��O. ��Qv�M,�f`KH[0q��l��20�y�/pUd�j_�R���ܠ&�:�}zOsZa�hu���$2�

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:)

data/lib/rb_sys/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module RbSys
-  VERSION = "0.9.77"
+  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.77
+  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-10 00:00:00.000000000 Z
+date: 2023-05-23 00:00:00.000000000 Z
 dependencies: []
 description:
 email: