diff options
| author | Jan-Marek Glogowski <glogow@fbihome.de> | 2020-07-17 23:17:37 +0200 |
|---|---|---|
| committer | Jan-Marek Glogowski <glogow@fbihome.de> | 2020-09-16 23:56:21 +0200 |
| commit | 03ce1e85428d4a273910bf7ca758ce050e95720c (patch) | |
| tree | 71cf2ceaaf4e83953f3b37d74ac61a100e776bcf /configure.ac | |
| parent | e6dfaf9f44f9939abc338c83b3024108431d0f69 (diff) | |
configure + gbuild: handle Windows Arm64
Change-Id: Idfc20c1234d693d6b402158b8bc782bd17cd3f4b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/102850
Tested-by: Jenkins
Reviewed-by: Jan-Marek Glogowski <glogow@fbihome.de>
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac index 5acf53a3601c..be73281b3e05 100644 --- a/configure.ac +++ b/configure.ac @@ -3390,6 +3390,16 @@ cygwin*) WIN_HOST_BITS=32 WIN_OTHER_ARCH="x64" ;; + aarch64) + CPUNAME=ARM64 + RTL_ARCH=arm64 + PLATFORMID=windows_arm64 + WINDOWS_X64=1 + SCPDEFS="$SCPDEFS -DWINDOWS_ARM64" + WIN_HOST_ARCH="arm64" + WIN_HOST_BITS=64 + with_ucrt_dir=no + ;; *) AC_MSG_ERROR([Unsupported host_cpu $host_cpu for host_os $host_os]) ;; @@ -3398,6 +3408,7 @@ cygwin*) case "$build_cpu" in x86_64) WIN_BUILD_ARCH="x64" ;; i*86) WIN_BUILD_ARCH="x86" ;; + aarch64) WIN_BUILD_ARCH="arm64" ;; *) AC_MSG_ERROR([Unsupported build_cpu $build_cpu for host_os $host_os]) ;; @@ -3792,7 +3803,7 @@ if test "$_os" = "WINNT"; then AC_MSG_RESULT([not found]) AC_MSG_WARN([Installation set will not contain 64-bit Explorer extensions]) fi - else + elif test "$WIN_HOST_ARCH" = "x64"; then CXX_X64_BINARY=$CXX fi AC_SUBST(BUILD_X64) @@ -10901,6 +10912,7 @@ if test "$_os" = "WINNT"; then case "$WIN_HOST_ARCH" in x86) assembler=ml.exe ;; x64) assembler=ml64.exe ;; + arm64) assembler=armasm64.exe ;; esac AC_MSG_CHECKING([for the MSVC assembler ($assembler)]) |