Skip to content

Commit fd53e36

Browse files
authored
Merge pull request #760 from puppetlabs/davids_test1
(CAT-1505) Remove unneeded lines from Ruby 3.2 setup
2 parents b0ba09b + 811a384 commit fd53e36

File tree

1 file changed

+0
-7
lines changed

1 file changed

+0
-7
lines changed

configs/components/runtime-pdk.rb

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
# This component exists to link in the gcc and stdc++ runtime libraries.
22
component "runtime-pdk" do |pkg, settings, platform|
3-
pkg.build_requires "libffi"
4-
pkg.build_requires "libyaml"
53

64
if platform.is_windows?
75
lib_type = platform.architecture == "x64" ? "seh" : "sjlj"
@@ -21,11 +19,6 @@
2119
pkg.install_file "#{settings[:tools_root]}/bin/libiconv-2.dll", "#{settings[:ruby_bindir]}/libiconv-2.dll"
2220
pkg.install_file "#{settings[:tools_root]}/bin/libffi-6.dll", "#{settings[:ruby_bindir]}/libffi-6.dll"
2321

24-
if settings[:ruby_major_version] >= 3
25-
pkg.install_file "#{settings[:bindir]}/libyaml-0-2.dll", "#{settings[:ruby_bindir]}/libyaml-0-2.dll"
26-
pkg.install_file "#{settings[:bindir]}/libffi-8.dll", "#{settings[:ruby_bindir]}/libffi-8.dll"
27-
end
28-
2922
# Copy the DLLs into additional ruby install bindirs as well.
3023
if settings.has_key?(:additional_rubies)
3124
settings[:additional_rubies].each do |rubyver, local_settings|

0 commit comments

Comments
 (0)