Skip to content

tools: fix master branch build for Windows on Arm #33511

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 2 commits into from
Closed

tools: fix master branch build for Windows on Arm #33511

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1336924
tools: fix GetCurrentThreadStackLimits error on Windows on Arm
richard-townsend-arm May 22, 2020
7725262
fix: zlib build error on Windows on Arm
richard-townsend-arm May 22, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 11 additions & 3 deletions tools/v8_gypfiles/v8.gyp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1073,8 +1073,10 @@
'<(V8_ROOT)/src/base/platform/platform-win32.cc',
'<(V8_ROOT)/src/base/win32-headers.h',
],

'defines': ['_CRT_RAND_S'], # for rand_s()
'conditions': [['target_arch == "arm64"', {
'defines': ['_WIN32_WINNT=0x0602'], # For GetCurrentThreadStackLimits on Windows on Arm
}]],
'defines': ['_CRT_RAND_S'], # for rand_s()
'direct_dependent_settings': {
'msvs_settings': {
'VCLinkerTool': {
Expand Down Expand Up @@ -1640,7 +1642,13 @@
'toolsets': ['host', 'target'],
}],
['OS=="win"', {
'defines': ['X86_WINDOWS'],
'conditions': [
['"<(target_arch)"=="arm64" and _toolset=="target"', {
'defines': ['CPU_NO_SIMD']
}, {
'defines': ['X86_WINDOWS']
}]
]
}],
],
'direct_dependent_settings': {
Expand Down