Commit ac24c80
committed
build: remove redundant condition from common.gypi
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: #45076
Refs: nodejs/node-gyp#2750
Refs: #38633
Reviewed-By: Michael Dawson <midawson@redhat.com>
Reviewed-By: Michaël Zasso <targos@protonmail.com>1 parent cd54bce commit ac24c80
1 file changed
Lines changed: 1 addition & 5 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -29,6 +29,7 @@ | |||
| 29 | 29 | 'error_on_warn%': 'false', | |
| 30 | 30 | ||
| 31 | 31 | 'openssl_fips%': '', | |
| 32 | + 'openssl_product': '<(STATIC_LIB_PREFIX)openssl<(STATIC_LIB_SUFFIX)', | ||
| 32 | 33 | 'openssl_no_asm%': 0, | |
| 33 | 34 | ||
| 34 | 35 | # Don't use ICU data file (icudtl.dat) from V8, we use our own. | |
@@ -101,11 +102,6 @@ | |||
| 101 | 102 | 'obj_dir%': '<(PRODUCT_DIR)/obj.target', | |
| 102 | 103 | 'v8_base': '<(PRODUCT_DIR)/obj.target/tools/v8_gypfiles/libv8_snapshot.a', | |
| 103 | 104 | }], | |
| 104 | - ['openssl_fips != ""', { | ||
| 105 | - 'openssl_product': '<(STATIC_LIB_PREFIX)openssl<(STATIC_LIB_SUFFIX)', | ||
| 106 | - }, { | ||
| 107 | - 'openssl_product': '<(STATIC_LIB_PREFIX)openssl<(STATIC_LIB_SUFFIX)', | ||
| 108 | - }], | ||
| 109 | 105 | ['OS=="mac"', { | |
| 110 | 106 | 'clang%': 1, | |
| 111 | 107 | 'obj_dir%': '<(PRODUCT_DIR)/obj.target', | |
0 commit comments