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 /scp2 | |
| parent | d402e4552e7d8c7cfda60ed3f0c7e11a856a70f4 (diff) | |
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>
Diffstat (limited to 'scp2')
| -rw-r--r-- | scp2/source/ooo/file_library_ooo.scp | 9 | ||||
| -rw-r--r-- | scp2/source/ooo/ure.scp | 2 |
2 files changed, 2 insertions, 9 deletions
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); |