mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

cli_ure: Disable .NET for Windows Arm64 build

Browse Source 
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>
This commit is contained in:
Jan-Marek Glogowski 2020-08-03 07:06:36 +02:00
parent d402e4552e
commit 26372c9ad0
5 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Repository.mk
View File

@ -546,7 +546,7 @@ $(eval $(call gb_Helper_register_libraries,PLAINLIBS_NONE, \
$(eval $(call gb_Helper_register_libraries_for_install,PLAINLIBS_URE,ure, \ $(eval $(call gb_Helper_register_libraries_for_install,PLAINLIBS_URE,ure, \
affine_uno_uno \ affine_uno_uno \
$(if $(filter MSC,$(COM)),cli_uno) \ $(if $(filter MSC,$(COM)),$(if $(filter-out ARM64,$(CPUNAME)),cli_uno)) \
i18nlangtag \ i18nlangtag \
$(if $(ENABLE_JAVA), \ $(if $(ENABLE_JAVA), \
java_uno \ java_uno \

2
cli_ure/Module_cli_ure.mk
View File

@ -10,6 +10,7 @@
$(eval $(call gb_Module_Module,cli_ure)) $(eval $(call gb_Module_Module,cli_ure))
ifeq ($(COM),MSC) ifeq ($(COM),MSC)
ifneq ($(CPUNAME),ARM64)
$(eval $(call gb_Module_add_targets,cli_ure,\ $(eval $(call gb_Module_add_targets,cli_ure,\
CliLibrary_cli_basetypes \ CliLibrary_cli_basetypes \
CliLibrary_cli_ure \ CliLibrary_cli_ure \
@ -22,5 +23,6 @@ $(eval $(call gb_Module_add_targets,cli_ure,\
Package_cli_basetypes_copy \ Package_cli_basetypes_copy \
)) ))
endif endif
endif
# vim: set noet sw=4 ts=4: # vim: set noet sw=4 ts=4:

9
scp2/source/ooo/file_library_ooo.scp
View File

@ -26,7 +26,7 @@
************************************************************************/ ************************************************************************/
#include "macros.inc" #include "macros.inc"
#if defined _MSC_VER #if defined _MSC_VER && ! defined _ARM64_
File gid_File_Lib_Cli_Oootypes_Assembly File gid_File_Lib_Cli_Oootypes_Assembly
TXT_FILE_BODY; TXT_FILE_BODY;
@ -41,9 +41,6 @@ File gid_File_Lib_Cli_Oootypes_Assembly
ProcessorArchitecture = "MSIL"; ProcessorArchitecture = "MSIL";
End End
#endif
#if defined _MSC_VER
File gid_File_Lib_Policy_Cli_Oootypes_Assembly File gid_File_Lib_Policy_Cli_Oootypes_Assembly
TXT_FILE_BODY; TXT_FILE_BODY;
Styles = (PACKED, ASSEMBLY); Styles = (PACKED, ASSEMBLY);
@ -57,10 +54,6 @@ File gid_File_Lib_Policy_Cli_Oootypes_Assembly
ProcessorArchitecture = "MSIL"; ProcessorArchitecture = "MSIL";
End End
#endif
#if defined _MSC_VER
File gid_File_Lib_Policy_Cli_Oootypes_Config File gid_File_Lib_Policy_Cli_Oootypes_Config
TXT_FILE_BODY; TXT_FILE_BODY;
Styles = (PACKED, ASSIGNCOMPONENT); Styles = (PACKED, ASSIGNCOMPONENT);

2
scp2/source/ooo/ure.scp
View File

@ -81,7 +81,7 @@ End
// Private Dynamic Libraries: // Private Dynamic Libraries:
#if defined _MSC_VER #if defined _MSC_VER && ! defined _ARM64_
File gid_File_Dl_Cli_Ure_Assembly File gid_File_Dl_Cli_Ure_Assembly
TXT_FILE_BODY; TXT_FILE_BODY;
Styles = (PACKED, ASSEMBLY); Styles = (PACKED, ASSEMBLY);

2
unoil/Module_unoil.mk
View File

@ -17,9 +17,11 @@ $(eval $(call gb_Module_add_targets,unoil,\
endif endif
ifeq ($(COM),MSC) ifeq ($(COM),MSC)
ifneq ($(CPUNAME),ARM64)
$(eval $(call gb_Module_add_targets,unoil,\ $(eval $(call gb_Module_add_targets,unoil,\
CliUnoApi_oootypes \ CliUnoApi_oootypes \
)) ))
endif endif
endif
# vim:set noet sw=4 ts=4: # vim:set noet sw=4 ts=4: