Skip to content
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

Jump to bottom

jck: add natives support for windows aarch64 #5660

Merged
merged 1 commit into from
Oct 1, 2024
Merged

jck: add natives support for windows aarch64 #5660

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
39 changes: 31 additions & 8 deletions jck/build.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,23 +53,46 @@
<available file="${vs14_vcvarsall_filename}" property="vs14_available"/>
<property name="vs10_vcvarsall_filename" location="c:\\Program Files (x86)\\Microsoft Visual Studio 10.0\\VC\\vcvarsall.bat"/>
<available file="${vs10_vcvarsall_filename}" property="vs10_available"/>
<property name="vs22_vcvarsall_filename" location="c:\\Program Files\\Microsoft Visual Studio\\2022\\Professional\\VC\\Auxiliary\\Build\\vcvarsall.bat"/>
<available file="${vs22_vcvarsall_filename}" property="vs22_available"/>
<property name="vs22_pro_vcvarsall_filename" location="c:\\Program Files\\Microsoft Visual Studio\\2022\\Professional\\VC\\Auxiliary\\Build\\vcvarsall.bat"/>
<available file="${vs22_pro_vcvarsall_filename}" property="vs22_pro_available"/>
<property name="vs22_bt_vcvarsall_filename" location="c:\\Program Files (x86)\\Microsoft Visual Studio\\2022\\BuildTools\\VC\\Auxiliary\\Build\\vcvarsall.bat"/>
<available file="${vs22_bt_vcvarsall_filename}" property="vs22_bt_available"/>
<condition property="vcvarsall_filename" value="${vs14_vcvarsall_filename}">
<isset property="vs14_available"/>
<and>
<isset property="vs14_available"/>
<not>
<equals arg1="${os.arch}" arg2="aarch64" trim="true"/>
</not>
</and>
</condition>
<condition property="vcvarsall_filename" value="${vs10_vcvarsall_filename}">
<isset property="vs10_available"/>
<and>
<isset property="vs10_available"/>
<not>
<equals arg1="${os.arch}" arg2="aarch64" trim="true"/>
</not>
</and>
</condition>
<condition property="vcvarsall_filename" value="${vs22_vcvarsall_filename}">
<isset property="vs22_available"/>
<condition property="vcvarsall_filename" value="${vs22_pro_vcvarsall_filename}">
<isset property="vs22_pro_available"/>
</condition>
<condition property="vcvarsall_filename" value="${vs22_bt_vcvarsall_filename}">
<isset property="vs22_bt_available"/>
</condition>
<condition property="windows_native_compiler_present" value="true">
<isset property="vcvarsall_filename"/>
</condition>


<condition property="vcvarsall_bits_arg" value="arm64">
<equals arg1="${os.arch}" arg2="aarch64" trim="true"/>
</condition>
<condition property="vcvarsall_bits_arg" value="amd64" else="">
<equals arg1="${sun.arch.data.model}" arg2="64" trim="true"/>
<and>
<equals arg1="${sun.arch.data.model}" arg2="64" trim="true"/>
<not>
<equals arg1="${os.arch}" arg2="aarch64" trim="true"/>
</not>
</and>
</condition>
<condition property="setup_windows_build_env" value='call "${vcvarsall_filename}" ${vcvarsall_bits_arg} &amp;&amp;' else="">
<equals arg1="${is_windows}" arg2="true"/>
Expand Down