Skip to content

Commit

Permalink
Clarify '/CETCOMPAT' is only for x86/x64 (#1133)
Browse files Browse the repository at this point in the history
This follows up to my previous commit [1] for #835.

This option (/CETCOMPAT) is not compatible with ARM64 builds.

As a preparation to build Mozc executables for ARM64 (#1130) let's
specify it in 'x86_Base' and 'x64_Base' instead of globally defining it.

There must be no change in the final artifacts.

 [1]: a0133fb

PiperOrigin-RevId: 702630613
  • Loading branch information
yukawa authored Dec 4, 2024
1 parent 73836cf commit 12c86d8
Showing 1 changed file with 6 additions and 3 deletions.
9 changes: 6 additions & 3 deletions src/gyp/common_win.gypi
Original file line number Diff line number Diff line change
Expand Up @@ -135,6 +135,9 @@
'UACExecutionLevel': '0', # level="asInvoker"
'UACUIAccess': 'false', # uiAccess="false"
'MinimumRequiredVersion': '10.0',
'AdditionalOptions': [
'/CETCOMPAT',
],
},
},
'msvs_configuration_attributes': {
Expand All @@ -158,6 +161,9 @@
},
'VCLinkerTool': {
'TargetMachine': '<(win_target_machine_x64)',
'AdditionalOptions': [
'/CETCOMPAT',
],
},
},
},
Expand Down Expand Up @@ -338,9 +344,6 @@
'user32.lib',
'uuid.lib',
],
'AdditionalOptions': [
'/CETCOMPAT',
],
'DataExecutionPrevention': '2', # /NXCOMPAT
'EnableCOMDATFolding': '2', # /OPT:ICF
'GenerateDebugInformation': 'true', # /DEBUG
Expand Down

0 comments on commit 12c86d8

Please sign in to comment.