diff options
| author | Jan-Marek Glogowski <glogow@fbihome.de> | 2020-08-03 07:06:36 +0200 |
|---|---|---|
| committer | Jan-Marek Glogowski <glogow@fbihome.de> | 2020-09-17 09:23:55 +0200 |
| commit | 26372c9ad0c11a1cfa23d151af6dda5a4604a9c4 (patch) | |
| tree | 896afca2ec58dc3992959861f625c373dd9ff9bd | |
| parent | Remove some unused includes (diff) | |
| download | core-26372c9ad0c11a1cfa23d151af6dda5a4604a9c4.tar.gz core-26372c9ad0c11a1cfa23d151af6dda5a4604a9c4.zip | |
cli_ure: Disable .NET for Windows Arm64 build
The current .NET 5.0 Arm64 preview doesn't have a mscoree.lib,
so linking the climaker isn't possible.
Change-Id: Ibbac88aa465a9ca2eb8fb0efaad91d20f358229b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/102858
Tested-by: Jenkins
Reviewed-by: Jan-Marek Glogowski <glogow@fbihome.de>
| -rw-r--r-- | Repository.mk | 2 | ||||
| -rw-r--r-- | cli_ure/Module_cli_ure.mk | 2 | ||||
| -rw-r--r-- | scp2/source/ooo/file_library_ooo.scp | 9 | ||||
| -rw-r--r-- | scp2/source/ooo/ure.scp | 2 | ||||
| -rw-r--r-- | unoil/Module_unoil.mk | 2 |
5 files changed, 7 insertions, 10 deletions
diff --git a/Repository.mk b/Repository.mk index dbb628f2a6b3..06f8588e2a19 100644 --- a/Repository.mk +++ b/Repository.mk @@ -546,7 +546,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)),cli_uno) \ + $(if $(filter MSC,$(COM)),$(if $(filter-out ARM64,$(CPUNAME)),cli_uno)) \ i18nlangtag \ $(if $(ENABLE_JAVA), \ java_uno \ diff --git a/cli_ure/Module_cli_ure.mk b/cli_ure/Module_cli_ure.mk index d1ff09073a18..91863abb59c9 100644 --- a/cli_ure/Module_cli_ure.mk +++ b/cli_ure/Module_cli_ure.mk @@ -10,6 +10,7 @@ $(eval $(call gb_Module_Module,cli_ure)) ifeq ($(COM),MSC) +ifneq ($(CPUNAME),ARM64) $(eval $(call gb_Module_add_targets,cli_ure,\ CliLibrary_cli_basetypes \ CliLibrary_cli_ure \ @@ -22,5 +23,6 @@ $(eval $(call gb_Module_add_targets,cli_ure,\ Package_cli_basetypes_copy \ )) endif +endif # vim: set noet sw=4 ts=4: diff --git a/scp2/source/ooo/file_library_ooo.scp b/scp2/source/ooo/file_library_ooo.scp index 350b0363a763..f1ddc7c62977 100644 --- a/scp2/source/ooo/file_library_ooo.scp +++ b/scp2/source/ooo/file_library_ooo.scp @@ -26,7 +26,7 @@ ************************************************************************/ #include "macros.inc" -#if defined _MSC_VER +#if defined _MSC_VER && ! defined _ARM64_ File gid_File_Lib_Cli_Oootypes_Assembly TXT_FILE_BODY; @@ -41,9 +41,6 @@ File gid_File_Lib_Cli_Oootypes_Assembly ProcessorArchitecture = "MSIL"; End -#endif - -#if defined _MSC_VER File gid_File_Lib_Policy_Cli_Oootypes_Assembly TXT_FILE_BODY; Styles = (PACKED, ASSEMBLY); @@ -57,10 +54,6 @@ File gid_File_Lib_Policy_Cli_Oootypes_Assembly ProcessorArchitecture = "MSIL"; End -#endif - -#if defined _MSC_VER - File gid_File_Lib_Policy_Cli_Oootypes_Config TXT_FILE_BODY; Styles = (PACKED, ASSIGNCOMPONENT); diff --git a/scp2/source/ooo/ure.scp b/scp2/source/ooo/ure.scp index 09109ebc41e6..30e06e4942f9 100644 --- a/scp2/source/ooo/ure.scp +++ b/scp2/source/ooo/ure.scp @@ -81,7 +81,7 @@ End // Private Dynamic Libraries: -#if defined _MSC_VER +#if defined _MSC_VER && ! defined _ARM64_ File gid_File_Dl_Cli_Ure_Assembly TXT_FILE_BODY; Styles = (PACKED, ASSEMBLY); diff --git a/unoil/Module_unoil.mk b/unoil/Module_unoil.mk index 5977368f2dab..6b1cb5fd064f 100644 --- a/unoil/Module_unoil.mk +++ b/unoil/Module_unoil.mk @@ -17,9 +17,11 @@ $(eval $(call gb_Module_add_targets,unoil,\ endif ifeq ($(COM),MSC) +ifneq ($(CPUNAME),ARM64) $(eval $(call gb_Module_add_targets,unoil,\ CliUnoApi_oootypes \ )) endif +endif # vim:set noet sw=4 ts=4: |