Skip to content

Commit

Permalink
Merge pull request #760 from puppetlabs/davids_test1
Browse files Browse the repository at this point in the history
(CAT-1505) Remove unneeded lines from Ruby 3.2 setup
  • Loading branch information
GSPatton authored Nov 14, 2023
2 parents b0ba09b + 811a384 commit fd53e36
Showing 1 changed file with 0 additions and 7 deletions.
7 changes: 0 additions & 7 deletions configs/components/runtime-pdk.rb
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
# This component exists to link in the gcc and stdc++ runtime libraries.
component "runtime-pdk" do |pkg, settings, platform|
pkg.build_requires "libffi"
pkg.build_requires "libyaml"

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

if settings[:ruby_major_version] >= 3
pkg.install_file "#{settings[:bindir]}/libyaml-0-2.dll", "#{settings[:ruby_bindir]}/libyaml-0-2.dll"
pkg.install_file "#{settings[:bindir]}/libffi-8.dll", "#{settings[:ruby_bindir]}/libffi-8.dll"
end

# Copy the DLLs into additional ruby install bindirs as well.
if settings.has_key?(:additional_rubies)
settings[:additional_rubies].each do |rubyver, local_settings|
Expand Down

0 comments on commit fd53e36

Please sign in to comment.