File tree Expand file tree Collapse file tree
Expand file tree Collapse file tree Original file line number Diff line number Diff line change 1212import subprocess
1313import shutil
1414from distutils .spawn import find_executable as which
15+ from distutils .version import StrictVersion
1516
1617# If not run from node/, cd to node/.
1718os .chdir (os .path .dirname (__file__ ) or '.' )
@@ -1229,10 +1230,10 @@ def without_ssl_error(option):
12291230 # supported asm compiler for AVX2. See https://github.com/openssl/openssl/
12301231 # blob/OpenSSL_1_1_0-stable/crypto/modes/asm/aesni-gcm-x86_64.pl#L52-L69
12311232 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' ) )
12361237
12371238 if is_x86 and not openssl110_asm_supported :
12381239 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