diff options
| author | Michaël Zasso <targos@protonmail.com> | 2019-10-14 14:51:48 +0200 |
|---|---|---|
| committer | Michaël Zasso <targos@protonmail.com> | 2019-10-18 09:29:15 +0200 |
| commit | d769ebc2b7be23d66033d8df71f70e0564436e72 (patch) | |
| tree | 38aa625785343551de9f589db93d5ed2c9dc0d58 /configure.py | |
| parent | c8df5cf74a2b495ccbc8b25a29c1692391c505f3 (diff) | |
| download | android-node-v8-d769ebc2b7be23d66033d8df71f70e0564436e72.tar.gz android-node-v8-d769ebc2b7be23d66033d8df71f70e0564436e72.tar.bz2 android-node-v8-d769ebc2b7be23d66033d8df71f70e0564436e72.zip | |
build: fix version checks in configure.py
Fixes: https://github.com/nodejs/node/issues/29927
Refs: https://github.com/nodejs/node/pull/29931
PR-URL: https://github.com/nodejs/node/pull/29965
Reviewed-By: Richard Lau <riclau@uk.ibm.com>
Reviewed-By: David Carlier <devnexen@gmail.com>
Reviewed-By: Luigi Pinca <luigipinca@gmail.com>
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Diffstat (limited to 'configure.py')
| -rwxr-xr-x | configure.py | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/configure.py b/configure.py index dd93d56e55..7305727c88 100755 --- a/configure.py +++ b/configure.py @@ -14,6 +14,7 @@ import shutil import bz2 from distutils.spawn import find_executable as which +from distutils.version import StrictVersion # If not run from node/, cd to node/. os.chdir(os.path.dirname(__file__) or '.') @@ -1231,10 +1232,10 @@ def configure_openssl(o): # supported asm compiler for AVX2. See https://github.com/openssl/openssl/ # blob/OpenSSL_1_1_0-stable/crypto/modes/asm/aesni-gcm-x86_64.pl#L52-L69 openssl110_asm_supported = \ - ('gas_version' in variables and float(variables['gas_version']) >= 2.23) or \ - ('xcode_version' in variables and float(variables['xcode_version']) >= 5.0) or \ - ('llvm_version' in variables and float(variables['llvm_version']) >= 3.3) or \ - ('nasm_version' in variables and float(variables['nasm_version']) >= 2.10) + ('gas_version' in variables and StrictVersion(variables['gas_version']) >= StrictVersion('2.23')) or \ + ('xcode_version' in variables and StrictVersion(variables['xcode_version']) >= StrictVersion('5.0')) or \ + ('llvm_version' in variables and StrictVersion(variables['llvm_version']) >= StrictVersion('3.3')) or \ + ('nasm_version' in variables and StrictVersion(variables['nasm_version']) >= StrictVersion('2.10')) if is_x86 and not openssl110_asm_supported: error('''Did not find a new enough assembler, install one or build with |