File tree 3 files changed +7
-12
lines changed
3 files changed +7
-12
lines changed Original file line number Diff line number Diff line change 1
- 9
1
+ 10
Original file line number Diff line number Diff line change @@ -94,15 +94,12 @@ module RbConfig
94
94
95
95
toolchain_path = Truffle ::Boot . toolchain_paths ( :PATH )
96
96
97
+ configure_args = ''
97
98
# Make C extensions use the same libssl as the one used for the openssl C extension
98
99
if Truffle ::Platform . darwin?
99
100
require 'truffle/openssl-prefix'
100
- openssl_prefix = ENV [ 'OPENSSL_PREFIX' ]
101
- if openssl_prefix
102
- # Change the same variables as MRI's --with-opt-dir configure option would
103
- cppflags << " -I#{ openssl_prefix } /include"
104
- ldflags << " -L#{ openssl_prefix } /lib"
105
- dldflags << " -L#{ openssl_prefix } /lib"
101
+ if openssl_prefix = ENV [ 'OPENSSL_PREFIX' ]
102
+ configure_args << " '--with-openssl-dir=#{ openssl_prefix } '"
106
103
end
107
104
end
108
105
@@ -131,7 +128,7 @@ module RbConfig
131
128
'ARCH_FLAG' => '' ,
132
129
'build' => host ,
133
130
'build_os' => host_os_full ,
134
- 'configure_args' => ' ' ,
131
+ 'configure_args' => configure_args ,
135
132
'CC' => cc ,
136
133
'CCDLFLAGS' => '-fPIC' ,
137
134
'CP' => 'cp' ,
Original file line number Diff line number Diff line change 14
14
require "mkmf"
15
15
16
16
if defined? ( ::TruffleRuby )
17
- require 'truffle/openssl-prefix'
18
- dir_config_given = dir_config ( "openssl" , ENV [ "OPENSSL_PREFIX" ] ) . any?
19
17
# Needed with libssl 3.0.0 and -Werror from building core C extensions
20
18
$warnflags += ' -Wno-deprecated-declarations'
21
- else
22
- dir_config_given = dir_config ( "openssl" ) . any?
23
19
end
24
20
21
+ dir_config_given = dir_config ( "openssl" ) . any?
22
+
25
23
dir_config ( "kerberos" )
26
24
27
25
Logging ::message "=== OpenSSL for Ruby configurator ===\n "
You can’t perform that action at this time.
0 commit comments