File tree Expand file tree Collapse file tree 2 files changed +5
-1
lines changed Expand file tree Collapse file tree 2 files changed +5
-1
lines changed Original file line number Diff line number Diff line change @@ -122,6 +122,11 @@ jobs:
122
122
- name : ' Install toolchain and dependencies'
123
123
run : |
124
124
# 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
125
130
'/c/Program Files (x86)/Microsoft Visual Studio/Installer/vs_installer.exe' \
126
131
modify --quiet --installPath 'C:\Program Files\Microsoft Visual Studio\2022\Enterprise' \
127
132
--add Microsoft.VisualStudio.Component.VC.${{ inputs.msvc-toolset-version }}.${{ inputs.msvc-toolset-architecture }}
Original file line number Diff line number Diff line change @@ -327,7 +327,6 @@ jobs:
327
327
msvc-toolset-version : ' 14.43'
328
328
msvc-toolset-architecture : ' arm64'
329
329
make-target : ' hotspot'
330
- extra-conf-options : ' --openjdk-target=aarch64-unknown-cygwin'
331
330
configure-arguments : ${{ github.event.inputs.configure-arguments }}
332
331
make-arguments : ${{ github.event.inputs.make-arguments }}
333
332
if : needs.prepare.outputs.windows-aarch64 == 'true'
You can’t perform that action at this time.
0 commit comments