From 6c205aba00d8a3ebad95eec60b0fcee46484cf4a Mon Sep 17 00:00:00 2001 From: Michaël Zasso Date: Wed, 9 Oct 2019 10:36:52 +0200 Subject: 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 Reviewed-By: Sam Roberts --- deps/openssl/openssl.gyp | 6 +++--- deps/openssl/openssl_common.gypi | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'deps') 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',], }], ], -- cgit v1.2.3