Skip to content

Commit

Permalink
fix host os detection on amazon linux
Browse files Browse the repository at this point in the history
amazon linux excludes gnu in some ruby configs, eg built-from source.
  • Loading branch information
CamJN committed May 17, 2024
1 parent 4556ae2 commit cf81a77
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 1 deletion.
1 change: 1 addition & 0 deletions CHANGELOG
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
Release 6.0.22 (Not yet released)
-------------
* Fix Amazon Linux detection. Closes GH-3296.


Release 6.0.21
Expand Down
2 changes: 1 addition & 1 deletion src/ruby_supportlib/phusion_passenger/common_library.rb
Original file line number Diff line number Diff line change
Expand Up @@ -304,7 +304,7 @@ def locate_source_file(path)
:category => :base,
:optimize => :very_heavy,
# Compiling with SSE2 causes segfaults on Amazon Linux 2
:cflags => RbConfig::CONFIG['host_cpu'] == 'x86_64' && RbConfig::CONFIG['host_os'] == 'linux-gnu' ? ' -mno-sse2' : '',
:cflags => RbConfig::CONFIG['host_cpu'] == 'x86_64' && RbConfig::CONFIG['host_os'].include?('linux') ? ' -mno-sse2' : '',
:strict_aliasing => false
define_component 'IOTools/IOUtils.o',
:source => 'IOTools/IOUtils.cpp',
Expand Down

0 comments on commit cf81a77

Please sign in to comment.