rb_sys 0.9.129 → 0.9.130

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 82ca808ba001224b45263763167b562faad29ce575bf8b490845cf85e555bc26
-  data.tar.gz: ef1ab354b5451ad6e815eebd65e9863a58e9cb73d0dd13732b2ffaa0db1e48ed
+  metadata.gz: e3e0c8b8dba44b339c68919b055cbaceacd426347771a15e288c0ce30dba4ae4
+  data.tar.gz: 87c5f0322d8ca0c6f91b8c4508fc6ee76a3581721d8c2e4299631fcbe9ebdb75
 SHA512:
-  metadata.gz: 062cc26ba140d61fc252b877446601287cd4098be9e7bbf3d8b464d2f3c08439bf749d8dc548fd44c38f33f7627f33ec908f1ff7e6e6db07fccb9e7ded30aaf6
-  data.tar.gz: 6b65c7ba433bf42579a13b43874155528fff7e1967e64f83cb304dc07223a7d3bd3f9c219ee8109edeb57ec511112421677ab09976c1d8508ee91553ea0c4e6c
+  metadata.gz: c513c9b21e6a025b1779a45559f7da443f7d3464e35d8db8c3f664a1757d051c6b1c8688081d4e71f93c5fe9f57592d3815d1194296ad02ea3e862c83c727998
+  data.tar.gz: 70a6da32dc974b268459bd767b9073ed1ee2fbe5dc876b710433a31c92b8a449618d0ad69e5d6a7b8b2660d994b24bb09ae581f5c43f679c5b649371f0cc3e0f

checksums.yaml.gz.sig

@@ -1,4 +1,2 @@
-�'�*����ft1�xmG[Lԡ�u�����v�#��^mA���aBbiC�p�M��΀�̈́�
$L�?T�����[O��|!M������ӯ�!6�Mr'���
-
����BS�%�\�8%o��pT�k}:W݈���P��3;�p��wn��
-X��fP�D#��X�2,Ϟ9Z�8�
-�H�L���H\"���<���֬c!���~LL����*d�
+�G."�q�88r�4Ң.&��~/�$�D�s�Ԭ��9�0�>�Xc���\��1�Ы�Ȗh,u�8봽�$���\����x?ӗ쪑B}���-��{��<�T�ت�ȵ4��l�C��kW��v�}�l9JNO1{4ZCe sٗVv*�~�>u
+Yh����pȝT}n��H�7�.h�8�#ύy���y��zwԊ��o��/�D�N�in^R��r�T0*8����+M�P��Yo^���
-�=��u�U����

data/lib/rb_sys/mkmf.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require "rubygems/ext"
+require "open3"
 require "shellwords"
 require_relative "cargo_builder"
 require_relative "mkmf/config"
@@ -217,7 +218,7 @@ module RbSys
       cargo_command.gsub!(/--profile [\w-]+/, "$(RB_SYS_CARGO_PROFILE_FLAG)")
       cargo_command.gsub!(%r{--features \S+}, "--features $(RB_SYS_CARGO_FEATURES)")
       cargo_command.gsub!(%r{--target \S+}, "--target $(CARGO_BUILD_TARGET)")
-      cargo_command.gsub!(/--target-dir (?:(?!--).)+/, "--target-dir $(RB_SYS_CARGO_TARGET_DIR) ")
+      cargo_command.gsub!(/--target-dir (?:\\.|[^[:space:]])+/, "--target-dir $(RB_SYS_CARGO_TARGET_DIR)")
       cargo_command
     end
 
@@ -358,14 +359,36 @@ module RbSys
       end
     end
 
-    def try_load_bundled_libclang(_builder)
+    def try_load_bundled_libclang(builder)
       require "libclang"
       assert_libclang_version_valid!
-      export_env("LIBCLANG_PATH", Libclang.libdir)
+
+      config = [export_env("LIBCLANG_PATH", Libclang.libdir)]
+      if (include_dir = compiler_builtin_include_dir(builder))
+        clang_args = Shellwords.join(["-isystem", include_dir])
+        config << conditional_assign("BINDGEN_EXTRA_CLANG_ARGS", clang_args, export: true)
+      end
+      config.join("\n")
     rescue LoadError
       # If we can't load the bundled libclang, just continue
     end
 
+    def compiler_builtin_include_dir(builder)
+      cc = env_or_makefile_config("CC", builder)
+      return unless cc
+
+      stdout, _stderr, status = Open3.capture3(*Shellwords.split(cc), "-print-file-name=include")
+      return unless status.success?
+
+      path = stdout.strip
+      return if path.empty? || path == "include"
+
+      include_dir = File.expand_path(path)
+      include_dir if Dir.exist?(include_dir)
+    rescue Errno::ENOENT
+      nil
+    end
+
     def assert_libclang_version_valid!
       libclang_version = Gem::Version.new(Libclang.version)
 

data/lib/rb_sys/toolchain_info/data.rb

@@ -5,6 +5,6 @@
 module RbSys
   class ToolchainInfo
     # @private
-    DATA = {"arm-linux" => {"rust-target" => "arm-unknown-linux-gnueabihf", "rake-compiler-dock" => {"cc" => "arm-linux-gnueabihf-gcc"}, "docker-platform" => "linux/arm/v7", "supported" => true}, "aarch64-linux" => {"aliases" => ["aarch64-linux-gnu", "aarch64-unknown-linux-gnu"], "rust-target" => "aarch64-unknown-linux-gnu", "rake-compiler-dock" => {"cc" => "aarch64-linux-gnu-gcc"}, "docker-platform" => "linux/arm64/v8", "supported" => true}, "aarch64-linux-musl" => {"rust-target" => "aarch64-unknown-linux-musl", "rake-compiler-dock" => {"cc" => "aarch64-linux-musl-gcc"}, "docker-platform" => "linux/arm64/v8", "supported" => true}, "arm64-darwin" => {"rust-target" => "aarch64-apple-darwin", "rake-compiler-dock" => {"cc" => "aarch64-apple-darwin-clang"}, "docker-platform" => "linux/arm64/v8", "supported" => true}, "x64-mingw-ucrt" => {"rust-target" => "x86_64-pc-windows-gnu", "rake-compiler-dock" => {"cc" => "x86_64-windows-gnu-gcc"}, "docker-platform" => "linux/amd64", "supported" => true}, "aarch64-mingw-ucrt" => {"rust-target" => "aarch64-pc-windows-gnullvm", "rake-compiler-dock" => {"cc" => "aarch64-w64-mingw32-clang"}, "docker-platform" => "linux/amd64", "supported" => true}, "x64-mingw32" => {"rust-target" => "x86_64-pc-windows-gnu", "rake-compiler-dock" => {"cc" => "x86_64-windows-gnu-gcc"}, "docker-platform" => "linux/amd64", "supported" => true}, "x86-linux" => {"rust-target" => "i686-unknown-linux-gnu", "rake-compiler-dock" => {"cc" => "i686-redhat-linux-gcc"}, "docker-platform" => "linux/i386", "supported" => false}, "x86-mingw32" => {"rust-target" => "i686-pc-windows-gnu", "rake-compiler-dock" => {"cc" => "i686-w64-mingw32-gcc"}, "docker-platform" => "linux/i386", "supported" => false}, "x86_64-darwin" => {"rust-target" => "x86_64-apple-darwin", "rake-compiler-dock" => {"cc" => "x86_64-apple-darwin-clang"}, "docker-platform" => "linux/amd64", "supported" => true}, "x86_64-linux" => {"aliases" => ["x86_64-linux-gnu", "x86_64-unknown-linux-gnu"], "rust-target" => "x86_64-unknown-linux-gnu", "rake-compiler-dock" => {"cc" => "x86_64-redhat-linux-gcc"}, "docker-platform" => "linux/amd64", "supported" => true}, "x86_64-linux-musl" => {"rust-target" => "x86_64-unknown-linux-musl", "rake-compiler-dock" => {"cc" => "x86_64-unknown-linux-musl-gcc"}, "docker-platform" => "linux/amd64", "supported" => true}}
+    DATA = {"arm-linux" => {"rust-target" => "arm-unknown-linux-gnueabihf", "rake-compiler-dock" => {"cc" => "arm-linux-gnueabihf-gcc"}, "docker-platform" => "linux/arm/v7", "supported" => true}, "arm-linux-musl" => {"rust-target" => "arm-unknown-linux-musleabihf", "rake-compiler-dock" => {"cc" => "arm-linux-musleabihf-gcc"}, "docker-platform" => "linux/arm/v7", "supported" => true}, "aarch64-linux" => {"aliases" => ["aarch64-linux-gnu", "aarch64-unknown-linux-gnu"], "rust-target" => "aarch64-unknown-linux-gnu", "rake-compiler-dock" => {"cc" => "aarch64-linux-gnu-gcc"}, "docker-platform" => "linux/arm64/v8", "supported" => true}, "aarch64-linux-musl" => {"rust-target" => "aarch64-unknown-linux-musl", "rake-compiler-dock" => {"cc" => "aarch64-linux-musl-gcc"}, "docker-platform" => "linux/arm64/v8", "supported" => true}, "arm64-darwin" => {"rust-target" => "aarch64-apple-darwin", "rake-compiler-dock" => {"cc" => "aarch64-apple-darwin-clang"}, "docker-platform" => "linux/arm64/v8", "supported" => true}, "x64-mingw-ucrt" => {"rust-target" => "x86_64-pc-windows-gnu", "rake-compiler-dock" => {"cc" => "x86_64-windows-gnu-gcc"}, "docker-platform" => "linux/amd64", "supported" => true}, "aarch64-mingw-ucrt" => {"rust-target" => "aarch64-pc-windows-gnullvm", "rake-compiler-dock" => {"cc" => "aarch64-w64-mingw32-clang"}, "docker-platform" => "linux/amd64", "supported" => true}, "x64-mingw32" => {"rust-target" => "x86_64-pc-windows-gnu", "rake-compiler-dock" => {"cc" => "x86_64-windows-gnu-gcc"}, "docker-platform" => "linux/amd64", "supported" => true}, "x86-linux" => {"rust-target" => "i686-unknown-linux-gnu", "rake-compiler-dock" => {"cc" => "i686-redhat-linux-gcc"}, "docker-platform" => "linux/i386", "supported" => false}, "x86-mingw32" => {"rust-target" => "i686-pc-windows-gnu", "rake-compiler-dock" => {"cc" => "i686-w64-mingw32-gcc"}, "docker-platform" => "linux/i386", "supported" => false}, "x86_64-darwin" => {"rust-target" => "x86_64-apple-darwin", "rake-compiler-dock" => {"cc" => "x86_64-apple-darwin-clang"}, "docker-platform" => "linux/amd64", "supported" => true}, "x86_64-linux" => {"aliases" => ["x86_64-linux-gnu", "x86_64-unknown-linux-gnu"], "rust-target" => "x86_64-unknown-linux-gnu", "rake-compiler-dock" => {"cc" => "x86_64-redhat-linux-gcc"}, "docker-platform" => "linux/amd64", "supported" => true}, "x86_64-linux-musl" => {"rust-target" => "x86_64-unknown-linux-musl", "rake-compiler-dock" => {"cc" => "x86_64-unknown-linux-musl-gcc"}, "docker-platform" => "linux/amd64", "supported" => true}}
   end
 end

data/lib/rb_sys/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rb_sys
 version: !ruby/object:Gem::Version
-  version: 0.9.129
+  version: 0.9.130
 platform: ruby
 authors:
 - Ian Ker-Seymer