Skip to content

Commit

Permalink
build: use PRODUCT_DIR_ABS for MODULESDIR
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
danbev committed Jun 17, 2021
1 parent a75b4b3 commit a8ff58a
Showing 1 changed file with 5 additions and 1 deletion.
6 changes: 5 additions & 1 deletion common.gypi
Original file line number Diff line number Diff line change
Expand Up @@ -86,16 +86,19 @@
'os_posix': 0,
'v8_postmortem_support%': 0,
'obj_dir': '<(PRODUCT_DIR)/obj',
'obj_dir_abs': '<(PRODUCT_DIR_ABS)/obj',
'v8_base': '<(PRODUCT_DIR)/lib/libv8_snapshot.a',
}, {
'os_posix': 1,
'v8_postmortem_support%': 1,
}],
['GENERATOR == "ninja"', {
'obj_dir': '<(PRODUCT_DIR)/obj',
'obj_dir_abs': '<(PRODUCT_DIR_ABS)/obj',
'v8_base': '<(PRODUCT_DIR)/obj/tools/v8_gypfiles/libv8_snapshot.a',
}, {
'obj_dir%': '<(PRODUCT_DIR)/obj.target',
'obj_dir_abs%': '<(PRODUCT_DIR_ABS)/obj.target',
'v8_base': '<(PRODUCT_DIR)/obj.target/tools/v8_gypfiles/libv8_snapshot.a',
}],
['openssl_fips != ""', {
Expand All @@ -106,6 +109,7 @@
['OS=="mac"', {
'clang%': 1,
'obj_dir%': '<(PRODUCT_DIR)/obj.target',
'obj_dir_abs%': '<(PRODUCT_DIR_ABS)/obj.target',
'v8_base': '<(PRODUCT_DIR)/libv8_snapshot.a',
}],
['target_arch in "ppc64 s390x"', {
Expand Down Expand Up @@ -565,7 +569,7 @@
}],
['node_use_openssl=="true"', {
'defines': [
'MODULESDIR="<(obj_dir)/deps/openssl/"',
'MODULESDIR="<(obj_dir_abs)/deps/openssl/lib/openssl-modules"',
],
}],
],
Expand Down

0 comments on commit a8ff58a

Please sign in to comment.