diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 93cb56fe23..cbd146ba8b 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -191,10 +191,6 @@ jobs: sudo apt install -y libcurl4-openssl-dev apache2-dev libapr1-dev libaprutil1-dev if: matrix.name == 'Linux' - - name: Setup macOS dependencies - run: brew install openssl - if: matrix.name == 'macOS' - - name: Setup hosts entries run: | echo 127.0.0.1 passenger.test | sudo tee -a /etc/hosts diff --git a/build/apache2.rb b/build/apache2.rb index 0dcace082d..b5b377f96a 100644 --- a/build/apache2.rb +++ b/build/apache2.rb @@ -126,7 +126,6 @@ PlatformInfo.apache2_module_cxx_ldflags, PlatformInfo.portability_cxx_ldflags, OPTIMIZE ? '-O' : nil, - USE_ASAN && PlatformInfo.cxx_is_clang? ? "-shared-libasan" : nil ].compact ) end diff --git a/src/ruby_supportlib/phusion_passenger/platform_info/compiler.rb b/src/ruby_supportlib/phusion_passenger/platform_info/compiler.rb index c22d0c5922..497169404f 100644 --- a/src/ruby_supportlib/phusion_passenger/platform_info/compiler.rb +++ b/src/ruby_supportlib/phusion_passenger/platform_info/compiler.rb @@ -239,6 +239,8 @@ def self.find_header(header_name, language, flags = nil) system("ls -lGd #{Shellwords.escape(tmpdir)}") system("ls -lG #{Shellwords.escape(tmpdir)}") system("ls -lG #{Shellwords.escape(filename)}") + log "ruby version = #{RUBY_VERSION}" + log "ruby command = #{ruby_command}" end if result = run_compiler("Checking for #{header_name}", command, filename, source, true) result[:output] =~ /^#include <...> search starts here:$(.+?)^End of search list\.$/m