Skip to content

Commit 900d15c

Browse files
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
1 parent cd54bce commit 900d15c

File tree

1 file changed

+1
-5
lines changed

1 file changed

+1
-5
lines changed

common.gypi

+1-5
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@
2929
'error_on_warn%': 'false',
3030

3131
'openssl_fips%': '',
32+
'openssl_product': '<(STATIC_LIB_PREFIX)openssl<(STATIC_LIB_SUFFIX)',
3233
'openssl_no_asm%': 0,
3334

3435
# Don't use ICU data file (icudtl.dat) from V8, we use our own.
@@ -101,11 +102,6 @@
101102
'obj_dir%': '<(PRODUCT_DIR)/obj.target',
102103
'v8_base': '<(PRODUCT_DIR)/obj.target/tools/v8_gypfiles/libv8_snapshot.a',
103104
}],
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-
}],
109105
['OS=="mac"', {
110106
'clang%': 1,
111107
'obj_dir%': '<(PRODUCT_DIR)/obj.target',

0 commit comments

Comments
 (0)