diff options
| author | Jan-Marek Glogowski <glogow@fbihome.de> | 2021-03-22 22:13:39 +0100 |
|---|---|---|
| committer | Jan-Marek Glogowski <glogow@fbihome.de> | 2021-03-23 23:46:12 +0100 |
| commit | 5e1b3e924ab3d8da3718c2a3bbd0ef812595684a (patch) | |
| tree | 1af73a649f62f6db48b546958979840b24e13b19 /configure.ac | |
| parent | 2a0ff854b165883d33bbbbf1292c34858e9865d1 (diff) | |
Rename LO Windows arm64 ID to aarch64
The Windows platform is called Arm64. But now that the ID for Mac
is also going to be renamed from arm64 to aarch64, this get's rid
of the arm64 as the UNO identifier and user in gbuild, just like
on all other Arm64 platforms.
Change-Id: I60a7eafd04b426f17b6e41ad9a09e6405c0d4173
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/112973
Tested-by: Jenkins
Reviewed-by: Jan-Marek Glogowski <glogow@fbihome.de>
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/configure.ac b/configure.ac index 368ccb84daa4..7cc376d9b242 100644 --- a/configure.ac +++ b/configure.ac @@ -3601,11 +3601,11 @@ cygwin*|wsl*) WIN_OTHER_ARCH="x64" ;; aarch64) - CPUNAME=ARM64 - RTL_ARCH=arm64 - PLATFORMID=windows_arm64 + CPUNAME=AARCH64 + RTL_ARCH=AARCH64 + PLATFORMID=windows_aarch64 WINDOWS_X64=1 - SCPDEFS="$SCPDEFS -DWINDOWS_ARM64" + SCPDEFS="$SCPDEFS -DWINDOWS_AARCH64" WIN_HOST_ARCH="arm64" WIN_HOST_BITS=64 with_ucrt_dir=no @@ -11713,7 +11713,7 @@ LO_CLANG_CXXFLAGS_INTRINSICS_AVX512= LO_CLANG_CXXFLAGS_INTRINSICS_F16C= LO_CLANG_CXXFLAGS_INTRINSICS_FMA= -if test "$ENABLE_SKIA" = TRUE -a "$COM_IS_CLANG" != TRUE -a ! \( "$_os" = "WINNT" -a "$CPUNAME" = "ARM64" \); then +if test "$ENABLE_SKIA" = TRUE -a "$COM_IS_CLANG" != TRUE -a ! \( "$_os" = "WINNT" -a "$CPUNAME" = "AARCH64" \); then if test -n "$LO_CLANG_CC" -a -n "$LO_CLANG_CXX"; then AC_MSG_CHECKING([for Clang]) AC_MSG_RESULT([$LO_CLANG_CC / $LO_CLANG_CXX]) |