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 /external/nss | |
| 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 'external/nss')
| -rw-r--r-- | external/nss/ExternalProject_nss.mk | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/external/nss/ExternalProject_nss.mk b/external/nss/ExternalProject_nss.mk index fb68da65adff..81e5dfb45d3e 100644 --- a/external/nss/ExternalProject_nss.mk +++ b/external/nss/ExternalProject_nss.mk @@ -28,12 +28,12 @@ $(call gb_ExternalProject_get_state_target,nss,build): \ OPT_CODE_SIZE=0) \ OS_TARGET=WIN95 \ $(if $(filter X86_64,$(CPUNAME)),USE_64=1) \ - $(if $(filter ARM64,$(CPUNAME)),USE_64=1) \ + $(if $(filter AARCH64,$(CPUNAME)),USE_64=1 CPU_ARCH=aarch64) \ LIB="$(ILIB)" \ XCFLAGS="$(SOLARINC)" \ $(if $(CROSS_COMPILING),\ CROSS_COMPILE=1 \ - $(if $(filter ARM64,$(CPUNAME)),CPU_ARCH=aarch64) \ + $(if $(filter AARCH64,$(CPUNAME)),CPU_ARCH=aarch64) \ NSPR_CONFIGURE_OPTS="--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)") \ $(MAKE) nss_build_all RC="rc.exe $(SOLARINC)" \ NSINSTALL='$(call gb_ExternalExecutable_get_command,python) $(SRCDIR)/external/nss/nsinstall.py' \ |