Tor Lillqvist
631974dd95
Change-Id: I6716048f0b58eb502b9d1ade8a13b8e33e4aaf2b Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105905 Tested-by: Jenkins Reviewed-by: Tor Lillqvist <tml@collabora.com>
51 lines
1.4 KiB
Diff
51 lines
1.4 KiB
Diff
-*- Mode: diff -*-
|
|
--- configure
|
|
+++ configure
|
|
@@ -9372,6 +9275,9 @@
|
|
esac
|
|
else
|
|
case `/usr/bin/arch` in
|
|
+ arm64)
|
|
+ MACOSX_DEFAULT_ARCH="arm64"
|
|
+ ;;
|
|
i386)
|
|
MACOSX_DEFAULT_ARCH="x86_64"
|
|
;;
|
|
--- Mac/Tools/pythonw.c
|
|
+++ Mac/Tools/pythonw.c
|
|
@@ -121,6 +121,8 @@
|
|
cpu_types[0] = CPU_TYPE_POWERPC;
|
|
#elif defined(__i386__)
|
|
cpu_types[0] = CPU_TYPE_X86;
|
|
+#elif defined(__arm64__)
|
|
+ cpu_types[0] = CPU_TYPE_ARM64;
|
|
#else
|
|
# error "Unknown CPU"
|
|
#endif
|
|
--- setup.py
|
|
+++ setup.py
|
|
@@ -670,7 +670,10 @@
|
|
add_dir_to_list(self.compiler.include_dirs,
|
|
sysconfig.get_config_var("INCLUDEDIR"))
|
|
|
|
- system_lib_dirs = ['/lib64', '/usr/lib64', '/lib', '/usr/lib']
|
|
+ if MACOS:
|
|
+ system_lib_dirs = ['/usr/lib', macosx_sdk_root()+'/usr/lib']
|
|
+ else:
|
|
+ system_lib_dirs = ['/lib64', '/usr/lib64', '/lib', '/usr/lib']
|
|
system_include_dirs = ['/usr/include']
|
|
# lib_dirs and inc_dirs are used to search for files;
|
|
# if a file is found in one of those directories, it can
|
|
--- Modules/_decimal/libmpdec/mpdecimal.h
|
|
+++ Modules/_decimal/libmpdec/mpdecimal.h
|
|
@@ -135,6 +135,9 @@
|
|
#elif defined(__x86_64__)
|
|
#define CONFIG_64
|
|
#define ASM
|
|
+ #elif defined(__arm64__)
|
|
+ #define CONFIG_64
|
|
+ #define ANSI
|
|
#else
|
|
#error "unknown architecture for universal build."
|
|
#endif
|