Skip to content

Commit

Permalink
Fix remaining "windows" references reg. fat binary gems
Browse files Browse the repository at this point in the history
  • Loading branch information
larskanis committed Jul 29, 2024
1 parent 5e7270b commit a2456c7
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
4 changes: 2 additions & 2 deletions Rakefile
Original file line number Diff line number Diff line change
Expand Up @@ -65,14 +65,14 @@ Rake::ExtensionTask.new do |ext|
ext.cross_config_options += CrossLibraries.map do |xlib|
{
xlib.platform => [
"--enable-windows-cross",
"--enable-cross-build",
"--with-openssl-platform=#{xlib.openssl_config}",
"--with-toolchain=#{xlib.toolchain}",
]
}
end

# Add libpq.dll to windows binary gemspec
# Add libpq.dll/.so to fat binary gemspecs
ext.cross_compiling do |spec|
spec.files << "ports/#{spec.platform.to_s}/lib/libpq.so.5" if spec.platform.to_s =~ /linux/
spec.files << "ports/#{spec.platform.to_s}/lib/libpq.dll" if spec.platform.to_s =~ /mingw|mswin/
Expand Down
2 changes: 1 addition & 1 deletion ext/extconf.rb
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
$stderr.puts "Calling libpq with GVL locked"
end

if enable_config("windows-cross")
if enable_config("cross-build")
gem 'mini_portile2', '~>2.1'
require 'mini_portile2'

Expand Down

0 comments on commit a2456c7

Please sign in to comment.