Skip to content

Commit 4642af0

Browse files
committed
Update Visual Studio paths for arm64 architecture in build workflows
1 parent 7d5071e commit 4642af0

File tree

2 files changed

+5
-1
lines changed

2 files changed

+5
-1
lines changed

.github/workflows/build-windows.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -122,6 +122,11 @@ jobs:
122122
- name: 'Install toolchain and dependencies'
123123
run: |
124124
# Run Visual Studio Installer
125+
if [ "${{ inputs.msvc-toolset-architecture }}" = "arm64" ]; then
126+
install_path="C:\Program Files\Microsoft Visual Studio\2022\Enterprise"
127+
else
128+
install_path="C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise"
129+
fi
125130
'/c/Program Files (x86)/Microsoft Visual Studio/Installer/vs_installer.exe' \
126131
modify --quiet --installPath 'C:\Program Files\Microsoft Visual Studio\2022\Enterprise' \
127132
--add Microsoft.VisualStudio.Component.VC.${{ inputs.msvc-toolset-version }}.${{ inputs.msvc-toolset-architecture }}

.github/workflows/main.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -327,7 +327,6 @@ jobs:
327327
msvc-toolset-version: '14.43'
328328
msvc-toolset-architecture: 'arm64'
329329
make-target: 'hotspot'
330-
extra-conf-options: '--openjdk-target=aarch64-unknown-cygwin'
331330
configure-arguments: ${{ github.event.inputs.configure-arguments }}
332331
make-arguments: ${{ github.event.inputs.make-arguments }}
333332
if: needs.prepare.outputs.windows-aarch64 == 'true'

0 commit comments

Comments
 (0)