Skip to content

Commit 5fdc24e

Browse files
authored
Merge pull request #844 from h0tw1r3/windows-ed25519
Bolt windows ed25519 support
2 parents 45ab2a8 + 38f3e8b commit 5fdc24e

File tree

2 files changed

+7
-7
lines changed

2 files changed

+7
-7
lines changed

configs/components/ruby-2.7.8.rb

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -237,7 +237,11 @@
237237
elsif platform.is_macos? && platform.architecture == 'arm64' && platform.os_version.to_i >= 13
238238
rbconfig_changes["CC"] = 'clang'
239239
elsif platform.is_windows?
240-
rbconfig_changes["CC"] = "x86_64-w64-mingw32-gcc"
240+
if platform.architecture == "x64"
241+
rbconfig_changes["CC"] = "x86_64-w64-mingw32-gcc"
242+
else
243+
rbconfig_changes["CC"] = "i686-w64-mingw32-gcc"
244+
end
241245
end
242246

243247
pkg.add_source("file://resources/files/ruby_vendor_gems/operating_system.rb")

configs/projects/bolt-runtime.rb

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -118,12 +118,8 @@
118118
proj.component "puppet-ca-bundle"
119119
proj.component "ruby-#{proj.ruby_version}"
120120

121-
# Building native gems on Windows has some issues right now.
122-
# Include for non-Windows platforms only.
123-
unless platform.is_windows?
124-
proj.component 'rubygem-bcrypt_pbkdf'
125-
proj.component 'rubygem-ed25519'
126-
end
121+
proj.component 'rubygem-bcrypt_pbkdf'
122+
proj.component 'rubygem-ed25519'
127123

128124
# Puppet dependencies
129125
proj.component 'rubygem-hocon'

0 commit comments

Comments
 (0)