diff options
| author | Michaël Zasso <targos@protonmail.com> | 2019-10-09 10:36:52 +0200 |
|---|---|---|
| committer | Michaël Zasso <targos@protonmail.com> | 2019-10-13 20:28:17 +0200 |
| commit | 6c205aba00d8a3ebad95eec60b0fcee46484cf4a (patch) | |
| tree | 7327978c5d1c1b22efdf11a2ec23c184e62e21d4 /deps/openssl | |
| parent | 66b953207d6f0e9c98155af97147a731b2e461bd (diff) | |
| download | android-node-v8-6c205aba00d8a3ebad95eec60b0fcee46484cf4a.tar.gz android-node-v8-6c205aba00d8a3ebad95eec60b0fcee46484cf4a.tar.bz2 android-node-v8-6c205aba00d8a3ebad95eec60b0fcee46484cf4a.zip | |
build: always use strings for compiler version in gyp files
If GYP finds a string variable that can be converted to an integer,
it will do it when the variable is expanded. Use "0.0" instead of "0"
to force strings and be able to use comparison operations such as
`gas_version >= "2.26"` in Python 3.
PR-URL: https://github.com/nodejs/node/pull/29897
Reviewed-By: Christian Clauss <cclauss@me.com>
Reviewed-By: Sam Roberts <vieuxtech@gmail.com>
Diffstat (limited to 'deps/openssl')
| -rw-r--r-- | deps/openssl/openssl.gyp | 6 | ||||
| -rw-r--r-- | deps/openssl/openssl_common.gypi | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/deps/openssl/openssl.gyp b/deps/openssl/openssl.gyp index 60f6ee03a7..0ca7515611 100644 --- a/deps/openssl/openssl.gyp +++ b/deps/openssl/openssl.gyp @@ -1,8 +1,8 @@ { 'variables': { - 'gas_version%': 0, - 'llvm_version%': 0, - 'nasm_version%': 0, + 'gas_version%': '0.0', + 'llvm_version%': '0.0', + 'nasm_version%': '0.0', }, 'targets': [ { diff --git a/deps/openssl/openssl_common.gypi b/deps/openssl/openssl_common.gypi index c4b95c20ae..67640a6325 100644 --- a/deps/openssl/openssl_common.gypi +++ b/deps/openssl/openssl_common.gypi @@ -64,7 +64,7 @@ 'TERMIOS', ], 'conditions': [ - [ 'llvm_version==0', { + [ 'llvm_version=="0.0"', { 'cflags': ['-Wno-old-style-declaration',], }], ], |