Skip to content

Commit

Permalink
Updating env vars for macos build failures
Browse files Browse the repository at this point in the history
Signed-off-by: John McCrae <[email protected]>
  • Loading branch information
johnmccrae committed Apr 1, 2024
1 parent 2dd02a1 commit cab83ef
Showing 1 changed file with 4 additions and 1 deletion.
5 changes: 4 additions & 1 deletion config/software/ruby.rb
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@
# would be harmless, except that autoconf treats any output to stderr as
# a failure when it makes a test program to check your CFLAGS (regardless
# of the actual exit code from the compiler).
brew install openssl@3 readline libyaml gmp
brew install openssl@3
export RUBY_CONFIGURE_OPTS="--with-openssl-dir=$(brew --prefix openssl@3)"
arch = intel? ? "x86_64" : "arm64"
env["CFLAGS"] << " -I#{install_dir}/embedded/include/ncurses -arch #{arch} -m64 -O3 -g -pipe -Qunused-arguments"
Expand Down Expand Up @@ -288,6 +288,9 @@
project.overrides[:openssl] &&
ChefUtils::VersionString.new(project.overrides[:openssl][:version]).satisfies?(">= 3.0")
configure_command << "--without-openssl --with-openssl-dir=#{install_dir}/embedded"
if RUBY_PLATFORM.include?("darwin")
configure_command << "--without-openssl --with-openssl-dir=$(brew --prefix openssl@3)"
end
end

# FFS: works around a bug that infects AIX when it picks up our pkg-config
Expand Down

0 comments on commit cab83ef

Please sign in to comment.