Skip to content

Commit a8ff58a

Browse files
committed
build: use PRODUCT_DIR_ABS for MODULESDIR
This commit updates the MODULESDIR value to be the absolute path to the modules directoy in the build output directory. The motivation for this that it allows us to not have to specify the environment variable OPENSSL_MODULES when running node and enabling FIPS.
1 parent a75b4b3 commit a8ff58a

File tree

1 file changed

+5
-1
lines changed

1 file changed

+5
-1
lines changed

common.gypi

+5-1
Original file line numberDiff line numberDiff line change
@@ -86,16 +86,19 @@
8686
'os_posix': 0,
8787
'v8_postmortem_support%': 0,
8888
'obj_dir': '<(PRODUCT_DIR)/obj',
89+
'obj_dir_abs': '<(PRODUCT_DIR_ABS)/obj',
8990
'v8_base': '<(PRODUCT_DIR)/lib/libv8_snapshot.a',
9091
}, {
9192
'os_posix': 1,
9293
'v8_postmortem_support%': 1,
9394
}],
9495
['GENERATOR == "ninja"', {
9596
'obj_dir': '<(PRODUCT_DIR)/obj',
97+
'obj_dir_abs': '<(PRODUCT_DIR_ABS)/obj',
9698
'v8_base': '<(PRODUCT_DIR)/obj/tools/v8_gypfiles/libv8_snapshot.a',
9799
}, {
98100
'obj_dir%': '<(PRODUCT_DIR)/obj.target',
101+
'obj_dir_abs%': '<(PRODUCT_DIR_ABS)/obj.target',
99102
'v8_base': '<(PRODUCT_DIR)/obj.target/tools/v8_gypfiles/libv8_snapshot.a',
100103
}],
101104
['openssl_fips != ""', {
@@ -106,6 +109,7 @@
106109
['OS=="mac"', {
107110
'clang%': 1,
108111
'obj_dir%': '<(PRODUCT_DIR)/obj.target',
112+
'obj_dir_abs%': '<(PRODUCT_DIR_ABS)/obj.target',
109113
'v8_base': '<(PRODUCT_DIR)/libv8_snapshot.a',
110114
}],
111115
['target_arch in "ppc64 s390x"', {
@@ -565,7 +569,7 @@
565569
}],
566570
['node_use_openssl=="true"', {
567571
'defines': [
568-
'MODULESDIR="<(obj_dir)/deps/openssl/"',
572+
'MODULESDIR="<(obj_dir_abs)/deps/openssl/lib/openssl-modules"',
569573
],
570574
}],
571575
],

0 commit comments

Comments
 (0)