Building on M1 (#20796)

* cereal builds

* UI builds

* libyuv
albatross
Adeeb Shihadeh 2021-05-02 14:21:49 -07:00 committed by GitHub
parent 5f61cd0531
commit c65c6102a6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 14 additions and 7 deletions

View File

@ -1 +0,0 @@
3.8.5

View File

@ -105,17 +105,22 @@ else:
cpppath = [] cpppath = []
if arch == "Darwin": if arch == "Darwin":
yuv_dir = "mac" if real_arch != "arm64" else "mac_arm64"
libpath = [ libpath = [
"#phonelibs/libyuv/mac/lib", f"#phonelibs/libyuv/{yuv_dir}/lib",
"#cereal",
"#selfdrive/common",
"/usr/local/lib", "/usr/local/lib",
"/opt/homebrew/lib",
"/usr/local/opt/openssl/lib", "/usr/local/opt/openssl/lib",
"/opt/homebrew/opt/openssl/lib",
"/System/Library/Frameworks/OpenGL.framework/Libraries", "/System/Library/Frameworks/OpenGL.framework/Libraries",
] ]
cflags += ["-DGL_SILENCE_DEPRECATION"] cflags += ["-DGL_SILENCE_DEPRECATION"]
cxxflags += ["-DGL_SILENCE_DEPRECATION"] cxxflags += ["-DGL_SILENCE_DEPRECATION"]
cpppath += ["/usr/local/opt/openssl/include"] cpppath += [
"/opt/homebrew/include",
"/usr/local/opt/openssl/include",
"/opt/homebrew/opt/openssl/include"
]
else: else:
libpath = [ libpath = [
"#phonelibs/snpe/x86_64-linux-clang", "#phonelibs/snpe/x86_64-linux-clang",
@ -279,7 +284,10 @@ if arch != "aarch64":
qt_libs = [] qt_libs = []
if arch == "Darwin": if arch == "Darwin":
qt_env['QTDIR'] = "/usr/local/opt/qt@5" if real_arch == "arm64":
qt_env['QTDIR'] = "/opt/homebrew/opt/qt@5"
else:
qt_env['QTDIR'] = "/usr/local/opt/qt@5"
qt_dirs = [ qt_dirs = [
os.path.join(qt_env['QTDIR'], "include"), os.path.join(qt_env['QTDIR'], "include"),
] ]

2
cereal

@ -1 +1 @@
Subproject commit 2b286090032f671a55eeb838ad815551eab033aa Subproject commit 90ce0e954f2ea0681e07deb81167716ff0394f3b

Binary file not shown.