From 02237b3f9c5337d20e39ee9939c8f3e1474e04a7 Mon Sep 17 00:00:00 2001 From: Jason Gavris Date: Sat, 2 Apr 2022 18:27:50 -0400 Subject: [PATCH 1/2] Update LLVM for [Support] [BLAKE3] Fix compilation with CMAKE_OSX_ARCHITECTURES --- deps.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deps.json b/deps.json index 9fb0274f8..7a074969c 100644 --- a/deps.json +++ b/deps.json @@ -6,7 +6,7 @@ "subrepo" : "llvm/llvm-project", "branch" : "main", "subdir" : "third_party/llvm", - "commit" : "5910150140cd5e781e7827d160ddce0a146cddd4" + "commit" : "308ca349cbc5fa891b08c525084fc86017bdc498" }, { "name" : "SPIRV-Headers", From 92db394edaae957b31a1e7d8e017cb4cb7312126 Mon Sep 17 00:00:00 2001 From: Jason Gavris Date: Sat, 2 Apr 2022 17:53:41 -0400 Subject: [PATCH 2/2] Enable universal binaries on Apple platforms --- CMakeLists.txt | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index 8dcc2bc65..cb2fe0053 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -15,6 +15,11 @@ cmake_minimum_required(VERSION 3.13.4) +# Enable universal binaries on modern Apple platforms. +IF(APPLE) + SET(CMAKE_OSX_ARCHITECTURES "x86_64;arm64" CACHE STRING "Build architectures for Mac OS X" FORCE) +ENDIF(APPLE) + if(NOT COMMAND find_host_package) macro(find_host_package) find_package(${ARGN})