Skip to content

Commit a550cd4

Browse files
fix inconsistency in variables
1 parent 9ddff4a commit a550cd4

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

common.gypi

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -310,7 +310,7 @@
310310
'/Zm2000',
311311
],
312312
}],
313-
['cfg=="true"', {
313+
['control_flow_guard=="true"', {
314314
'AdditionalOptions': [
315315
'/guard:cf', # Control Flow Guard
316316
],
@@ -341,7 +341,7 @@
341341
['target_arch=="arm64"', {
342342
'TargetMachine' : 0, # NotSet. MACHINE:ARM64 is inferred from the input files.
343343
}],
344-
['cfg=="true"', {
344+
['control_flow_guard=="true"', {
345345
'AdditionalOptions': [
346346
'/guard:cf', # Control Flow Guard
347347
],

configure.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1400,7 +1400,7 @@ def configure_node(o):
14001400
o['variables']['node_prefix'] = options.prefix
14011401
o['variables']['node_install_npm'] = b(not options.without_npm)
14021402
o['variables']['node_install_corepack'] = b(not options.without_corepack)
1403-
o['variables']['cfg'] = b(options.enable_cfg)
1403+
o['variables']['control_flow_guard'] = b(options.enable_cfg)
14041404
o['variables']['node_use_amaro'] = b(not options.without_amaro)
14051405
o['variables']['debug_node'] = b(options.debug_node)
14061406
o['default_configuration'] = 'Debug' if options.debug else 'Release'

vcbuild.bat

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -209,7 +209,7 @@ if defined openssl_no_asm set configure_flags=%configure_flags% --openssl-no-a
209209
if defined no_shared_roheap set configure_flags=%configure_flags% --disable-shared-readonly-heap
210210
if defined DEBUG_HELPER set configure_flags=%configure_flags% --verbose
211211
if defined compile_commands set configure_flags=%configure_flags% -C
212-
if defined cfg set configure_flags=%configure_flags% --cfg
212+
if defined cfg set configure_flags=%configure_flags% --control-flow-guard
213213

214214
if "%target_arch%"=="x86" (
215215
echo "32-bit Windows builds are not supported anymore."

0 commit comments

Comments
 (0)