From ac24c8066320adc55138b13dcbebdcd2f52f4d4e Mon Sep 17 00:00:00 2001 From: Richard Lau Date: Wed, 19 Oct 2022 12:03:35 -0400 Subject: [PATCH] build: remove redundant condition from common.gypi MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Both paths for the condition being removed result in the same value being assigned to `openssl_product`. This condition was also problematic as it was testing a variable in the same scope which gyp/gyp-next currently does not support. Refs: https://gyp.gsrc.io/docs/InputFormatReference.md#user_defined-variables PR-URL: https://github.com/nodejs/node/pull/45076 Refs: https://github.com/nodejs/node-gyp/issues/2750 Refs: https://github.com/nodejs/node/pull/38633 Reviewed-By: Michael Dawson Reviewed-By: Michaël Zasso --- common.gypi | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/common.gypi b/common.gypi index d68a4c9eafacfa..9d16d17272bf6c 100644 --- a/common.gypi +++ b/common.gypi @@ -29,6 +29,7 @@ 'error_on_warn%': 'false', 'openssl_fips%': '', + 'openssl_product': '<(STATIC_LIB_PREFIX)openssl<(STATIC_LIB_SUFFIX)', 'openssl_no_asm%': 0, # Don't use ICU data file (icudtl.dat) from V8, we use our own. @@ -101,11 +102,6 @@ 'obj_dir%': '<(PRODUCT_DIR)/obj.target', 'v8_base': '<(PRODUCT_DIR)/obj.target/tools/v8_gypfiles/libv8_snapshot.a', }], - ['openssl_fips != ""', { - 'openssl_product': '<(STATIC_LIB_PREFIX)openssl<(STATIC_LIB_SUFFIX)', - }, { - 'openssl_product': '<(STATIC_LIB_PREFIX)openssl<(STATIC_LIB_SUFFIX)', - }], ['OS=="mac"', { 'clang%': 1, 'obj_dir%': '<(PRODUCT_DIR)/obj.target',