File tree 4 files changed +17
-2
lines changed
4 files changed +17
-2
lines changed Original file line number Diff line number Diff line change 43
43
44
44
/config.mk
45
45
/config.gypi
46
+ /config_fips.gypi
46
47
* -nodegyp *
47
48
/gyp-mac-tool
48
49
/dist-osx
Original file line number Diff line number Diff line change 74
74
75
75
distclean :
76
76
-rm -rf out
77
- -rm -f config.gypi icu_config.gypi
77
+ -rm -f config.gypi icu_config.gypi config_fips.gypi
78
78
-rm -f config.mk
79
79
-rm -rf $(NODE_EXE ) $(NODE_G_EXE )
80
80
-rm -rf node_modules
Original file line number Diff line number Diff line change @@ -782,7 +782,7 @@ def configure_openssl(o):
782
782
o ['variables' ]['openssl_fips' ] = options .openssl_fips
783
783
fips_dir = os .path .join (root_dir , 'deps' , 'openssl' , 'fips' )
784
784
fips_ld = os .path .abspath (os .path .join (fips_dir , 'fipsld' ))
785
- o ['make_global_settings ' ] = [
785
+ o ['make_fips_settings ' ] = [
786
786
['LINK' , fips_ld + ' <(openssl_fips)/bin/fipsld' ],
787
787
]
788
788
else :
@@ -1104,6 +1104,15 @@ configure_fullystatic(output)
1104
1104
variables = output ['variables' ]
1105
1105
del output ['variables' ]
1106
1106
1107
+ # make_global_settings for special FIPS linking
1108
+ # should not be used to compile modules in node-gyp
1109
+ config_fips = { 'make_global_settings' : [] }
1110
+ if 'make_fips_settings' in output :
1111
+ config_fips ['make_global_settings' ] = output ['make_fips_settings' ]
1112
+ del output ['make_fips_settings' ]
1113
+ write ('config_fips.gypi' , do_not_edit +
1114
+ pprint .pformat (config_fips , indent = 2 ) + '\n ' )
1115
+
1107
1116
# make_global_settings should be a root level element too
1108
1117
if 'make_global_settings' in output :
1109
1118
make_global_settings = output ['make_global_settings' ]
Original file line number Diff line number Diff line change @@ -30,17 +30,22 @@ def run_gyp(args):
30
30
args .append (os .path .join (node_root , 'node.gyp' ))
31
31
common_fn = os .path .join (node_root , 'common.gypi' )
32
32
options_fn = os .path .join (node_root , 'config.gypi' )
33
+ options_fips_fn = os .path .join (node_root , 'config_fips.gypi' )
33
34
else :
34
35
args .append (os .path .join (os .path .abspath (node_root ), 'node.gyp' ))
35
36
common_fn = os .path .join (os .path .abspath (node_root ), 'common.gypi' )
36
37
options_fn = os .path .join (os .path .abspath (node_root ), 'config.gypi' )
38
+ options_fips_fn = os .path .join (os .path .abspath (node_root ), 'config_fips.gypi' )
37
39
38
40
if os .path .exists (common_fn ):
39
41
args .extend (['-I' , common_fn ])
40
42
41
43
if os .path .exists (options_fn ):
42
44
args .extend (['-I' , options_fn ])
43
45
46
+ if os .path .exists (options_fips_fn ):
47
+ args .extend (['-I' , options_fips_fn ])
48
+
44
49
args .append ('--depth=' + node_root )
45
50
46
51
# There's a bug with windows which doesn't allow this feature.
You can’t perform that action at this time.
0 commit comments