File tree 1 file changed +5
-4
lines changed
1 file changed +5
-4
lines changed Original file line number Diff line number Diff line change 12
12
import subprocess
13
13
import shutil
14
14
from distutils .spawn import find_executable as which
15
+ from distutils .version import StrictVersion
15
16
16
17
# If not run from node/, cd to node/.
17
18
os .chdir (os .path .dirname (__file__ ) or '.' )
@@ -1229,10 +1230,10 @@ def without_ssl_error(option):
1229
1230
# supported asm compiler for AVX2. See https://github.com/openssl/openssl/
1230
1231
# blob/OpenSSL_1_1_0-stable/crypto/modes/asm/aesni-gcm-x86_64.pl#L52-L69
1231
1232
openssl110_asm_supported = \
1232
- ('gas_version' in variables and float (variables ['gas_version' ]) >= 2.23 ) or \
1233
- ('xcode_version' in variables and float (variables ['xcode_version' ]) >= 5.0 ) or \
1234
- ('llvm_version' in variables and float (variables ['llvm_version' ]) >= 3.3 ) or \
1235
- ('nasm_version' in variables and float (variables ['nasm_version' ]) >= 2.10 )
1233
+ ('gas_version' in variables and StrictVersion (variables ['gas_version' ]) >= StrictVersion ( ' 2.23' ) ) or \
1234
+ ('xcode_version' in variables and StrictVersion (variables ['xcode_version' ]) >= StrictVersion ( ' 5.0' ) ) or \
1235
+ ('llvm_version' in variables and StrictVersion (variables ['llvm_version' ]) >= StrictVersion ( ' 3.3' ) ) or \
1236
+ ('nasm_version' in variables and StrictVersion (variables ['nasm_version' ]) >= StrictVersion ( ' 2.10' ) )
1236
1237
1237
1238
if is_x86 and not openssl110_asm_supported :
1238
1239
error ('''Did not find a new enough assembler, install one or build with
You can’t perform that action at this time.
0 commit comments