Repository.mk | 6 +++---
cli_ure/Module_cli_ure.mk | 2 +-
configure.ac | 5 +++++
odk/CustomTarget_check.mk | 2 +-
odk/Module_odk.mk | 2 +-
unoil/Module_unoil.mk | 2 +-
6 files changed, 12 insertions(+), 7 deletions(-)
New commits:
commit d04f1cf9373e4fa7dd6d3db660393894916e41a8
Author: Christian Lohmaier <lohmaier+libreoff...@googlemail.com>
AuthorDate: Wed Apr 5 12:58:26 2023 +0200
Commit: Christian Lohmaier <lohmaier+libreoff...@googlemail.com>
CommitDate: Tue Apr 11 12:06:25 2023 +0200
allow native compile for windows aarch64
using both --host=aarch64-pc-cygwin and --build=aarch64-pc-cygwin on a
suitable system.
Change-Id: Id11e25b03de8dd8dd52c63e7a06d57d44e3fce33
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/150053
Tested-by: Jenkins
Reviewed-by: Christian Lohmaier <lohmaier+libreoff...@googlemail.com>
diff --git a/Repository.mk b/Repository.mk
index f8dc574145b7..fb87ff5de068 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -88,7 +88,7 @@ $(eval $(call gb_Helper_register_executables,NONE, \
))
$(eval $(call gb_Helper_register_executables_for_install,SDK,sdk, \
- $(if $(filter MSC,$(COM)),$(if $(filter-out
AARCH64,$(CPUNAME)),climaker)) \
+ $(if $(filter MSC,$(COM)),$(if $(filter-out
AARCH64_TRUE,$(CPUNAME)_$(CROSS_COMPILING)),climaker)) \
cppumaker \
javamaker \
$(call gb_CondExeSp2bv,sp2bv) \
@@ -592,7 +592,7 @@ $(eval $(call gb_Helper_register_libraries,PLAINLIBS_NONE, \
$(eval $(call gb_Helper_register_libraries_for_install,PLAINLIBS_URE,ure, \
affine_uno_uno \
- $(if $(filter MSC,$(COM)),$(if $(filter-out
AARCH64,$(CPUNAME)),cli_uno)) \
+ $(if $(filter MSC,$(COM)),$(if $(filter-out
AARCH64_TRUE,$(CPUNAME)_$(CROSS_COMPILING)),cli_uno)) \
i18nlangtag \
$(if $(ENABLE_JAVA), \
java_uno \
@@ -903,7 +903,7 @@ $(eval $(call
gb_Helper_register_packages_for_install,postgresqlsdbc,\
$(eval $(call gb_Helper_register_packages_for_install,sdk,\
odk_share_readme \
odk_share_readme_generated \
- $(if $(filter WNT,$(OS)),$(if $(filter-out
AARCH64,$(CPUNAME)),odk_cli)) \
+ $(if $(filter WNT,$(OS)),$(if $(filter-out
AARCH64_TRUE,$(CPUNAME)_$(CROSS_COMPILING)),odk_cli)) \
odk_config \
$(if $(filter WNT,$(OS)),odk_config_win) \
odk_docs \
diff --git a/cli_ure/Module_cli_ure.mk b/cli_ure/Module_cli_ure.mk
index 3730ebdc75f0..ba18aecd1e4b 100644
--- a/cli_ure/Module_cli_ure.mk
+++ b/cli_ure/Module_cli_ure.mk
@@ -10,7 +10,7 @@
$(eval $(call gb_Module_Module,cli_ure))
ifeq ($(COM),MSC)
-ifneq ($(CPUNAME),AARCH64)
+ifneq ($(CPUNAME)_$(CROSS_COMPILING),AARCH64_TRUE)
$(eval $(call gb_Module_add_targets,cli_ure,\
CliLibrary_cli_basetypes \
CliLibrary_cli_ure \
diff --git a/configure.ac b/configure.ac
index b4763c487c55..d0693d23cd77 100644
--- a/configure.ac
+++ b/configure.ac
@@ -14708,6 +14708,11 @@ else
# needed for msi packaging
pathmunge "$WINDOWS_SDK_BINDIR_NO_ARCH/x86" "before"
fi
+ if test "$WIN_BUILD_ARCH" = "arm64"; then
+ # needed for msi packaging - as of 10.0.22621 SDK no arm64 ones yet
+ # the x86 ones probably would work just as well...
+ pathmunge "$WINDOWS_SDK_BINDIR_NO_ARCH/arm" "before"
+ fi
# .NET 4.6 and higher don't have bin directory
if test -f "$DOTNET_FRAMEWORK_HOME/bin"; then
pathmunge "$DOTNET_FRAMEWORK_HOME/bin" "before"
diff --git a/odk/CustomTarget_check.mk b/odk/CustomTarget_check.mk
index 98d31c3a9c5e..f0095619d50e 100644
--- a/odk/CustomTarget_check.mk
+++ b/odk/CustomTarget_check.mk
@@ -27,7 +27,7 @@ odk_PLATFORM := $(if $(filter WNT,$(OS)),windows,\
$(call gb_CustomTarget_get_workdir,odk/check)/checkbin : \
$(SRCDIR)/odk/util/check.pl \
$(if $(DOXYGEN),$(call
gb_GeneratedPackage_get_target,odk_doxygen)) \
- $(foreach exe,$(if $(filter WNT,$(OS)),$(if $(filter-out
AARCH64,$(CPUNAME)),climaker)) cppumaker \
+ $(foreach exe,$(if $(filter WNT,$(OS)),$(if $(filter-out
AARCH64_TRUE,$(CPUNAME)_$(CROSS_COMPILING)),climaker)) cppumaker \
javamaker uno-skeletonmaker unoapploader
unoidl-read unoidl-write,\
$(call gb_Executable_get_target,$(exe))) \
$(if $(filter WNT,$(OS)),$(call gb_Package_get_target,odk_cli))
\
diff --git a/odk/Module_odk.mk b/odk/Module_odk.mk
index 16eba69c3e3a..8b8ee8ccaac0 100644
--- a/odk/Module_odk.mk
+++ b/odk/Module_odk.mk
@@ -33,7 +33,7 @@ $(eval $(call gb_Module_add_targets,odk,\
ifeq ($(OS),WNT)
$(eval $(call gb_Module_add_targets,odk,\
- $(if $(filter-out AARCH64,$(CPUNAME)),Package_cli) \
+ $(if $(filter-out
AARCH64_TRUE,$(CPUNAME)_$(CROSS_COMPILING)),Package_cli) \
CustomTarget_config_win \
Package_config_win \
))
diff --git a/unoil/Module_unoil.mk b/unoil/Module_unoil.mk
index 96c90e6b08c3..23b15181437a 100644
--- a/unoil/Module_unoil.mk
+++ b/unoil/Module_unoil.mk
@@ -17,7 +17,7 @@ $(eval $(call gb_Module_add_targets,unoil,\
endif
ifeq ($(COM),MSC)
-ifneq ($(CPUNAME),AARCH64)
+ifneq ($(CPUNAME)_$(CROSS_COMPILING),AARCH64_TRUE)
$(eval $(call gb_Module_add_targets,unoil,\
CliUnoApi_oootypes \
))
