From 1d0a087d45ff898862eb829a718af5d855adfc7c Mon Sep 17 00:00:00 2001 From: Kazuki Yamaguchi Date: Fri, 2 Jun 2023 01:51:03 +0900 Subject: [PATCH] [ruby/openssl] extconf.rb: apply RUBY_OPENSSL_EXT{C,LD}FLAGS after checking features RUBY_OPENSSL_EXTCFLAGS and RUBY_OPENSSL_EXTLDFLAGS have been added for the primary purpose of appending custom warning flags during development and CI. Since checking programs generated by mkmf may not be completely warning-free, we don't want to apply -Werror that may be supplied from those environment variables. https://github.com/ruby/openssl/commit/2a95b971d5 --- ext/openssl/extconf.rb | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/ext/openssl/extconf.rb b/ext/openssl/extconf.rb index 737d93183f..551c470a70 100644 --- a/ext/openssl/extconf.rb +++ b/ext/openssl/extconf.rb @@ -18,12 +18,6 @@ dir_config("kerberos") Logging::message "=== OpenSSL for Ruby configurator ===\n" -# Append flags from environment variables. -extcflags = ENV["RUBY_OPENSSL_EXTCFLAGS"] -append_cflags(extcflags.split) if extcflags -extldflags = ENV["RUBY_OPENSSL_EXTLDFLAGS"] -append_ldflags(extldflags.split) if extldflags - ## # Adds -DOSSL_DEBUG for compilation and some more targets when GCC is used # To turn it on, use: --with-debug or --enable-debug @@ -198,6 +192,12 @@ have_func("EVP_PKEY_dup(NULL)", evp_h) Logging::message "=== Checking done. ===\n" +# Append flags from environment variables. +extcflags = ENV["RUBY_OPENSSL_EXTCFLAGS"] +append_cflags(extcflags.split) if extcflags +extldflags = ENV["RUBY_OPENSSL_EXTLDFLAGS"] +append_ldflags(extldflags.split) if extldflags + create_header create_makefile("openssl") Logging::message "Done.\n"