Skip to content

Commit

Permalink
Apply: nodejs#46228
Browse files Browse the repository at this point in the history
Fixes Release build on VS2022 ARM64
  • Loading branch information
sparist committed Dec 8, 2023
1 parent 3a67676 commit 12ccaa4
Show file tree
Hide file tree
Showing 4 changed files with 20 additions and 2 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/build-windows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ jobs:
if: github.event.pull_request.draft == false
strategy:
matrix:
windows: [windows-2019]
windows: [windows-2019, windows-2022]
fail-fast: false
runs-on: ${{ matrix.windows }}
steps:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/coverage-windows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ permissions:
jobs:
coverage-windows:
if: github.event.pull_request.draft == false
runs-on: windows-2019
runs-on: windows-2022
steps:
- uses: actions/checkout@v3
with:
Expand Down
10 changes: 10 additions & 0 deletions tools/v8_gypfiles/directory.build.props
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
<Project>
<ItemDefinitionGroup>
<MARMASM>
<!-- Works around a situation when we preprocess file in $(IntDir). In such case the output file is the same as input file
and we get access violation. Appending '.pp' file extension to the output file name resolves this issue. -->
<PreprocessedFileName Condition="'%(PreprocessedFileName)' == ''">$(IntDir)%(FileName)%(Extension).pp</PreprocessedFileName>
</MARMASM>
</ItemDefinitionGroup>
</Project>
8 changes: 8 additions & 0 deletions tools/v8_gypfiles/v8.gyp
Original file line number Diff line number Diff line change
Expand Up @@ -1436,6 +1436,14 @@
['want_separate_host_toolset', {
'toolsets': ['host'],
}],
['OS=="win"', {
'msvs_precompiled_header': '<(V8_ROOT)/../../tools/msvs/pch/v8_pch.h',
'msvs_precompiled_source': '<(V8_ROOT)/../../tools/msvs/pch/v8_pch.cc',
'sources': [
'<(_msvs_precompiled_header)',
'<(_msvs_precompiled_source)',
],
}],
],
}, # mksnapshot
{
Expand Down

0 comments on commit 12ccaa4

Please sign in to comment.