Skip to content

Commit

Permalink
[cmake] Patch tbb for Apple M1 (issue root-project#6903).
Browse files Browse the repository at this point in the history
Apply patch from uxlfoundation/oneTBB#258
  • Loading branch information
Axel-Naumann committed Jan 12, 2021
1 parent d368ae0 commit e46ea70
Showing 1 changed file with 6 additions and 0 deletions.
6 changes: 6 additions & 0 deletions cmake/modules/SearchInstalledSoftware.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -1214,6 +1214,11 @@ if(builtin_tbb)
elseif(CMAKE_CXX_COMPILER_ID STREQUAL GNU)
set(_tbb_compiler compiler=gcc)
endif()
if(${ROOT_ARCHITECTURE} MATCHES "macosxarm64")
set(tbb_command "patch -p1 -i ${CMAKE_SOURCE_DIR}/builtins/tbb/patches/apple-m1.patch")
else()
set(tbb_command "")
endif()
if(MSVC)
set(vsdir "vs2013")
set(TBB_LIBRARIES ${CMAKE_BINARY_DIR}/lib/tbb.lib)
Expand Down Expand Up @@ -1256,6 +1261,7 @@ if(builtin_tbb)
URL_HASH SHA256=${tbb_sha256}
INSTALL_DIR ${CMAKE_BINARY_DIR}
PATCH_COMMAND sed -i -e "/clang -v/s@-v@--version@" build/macos.inc
COMMAND ${tbb_command}
CONFIGURE_COMMAND ""
BUILD_COMMAND make ${_tbb_compiler} cpp0x=1 "CXXFLAGS=${_tbb_cxxflags}" CPLUS=${CMAKE_CXX_COMPILER} CONLY=${CMAKE_C_COMPILER} "LDFLAGS=${_tbb_ldflags}"
INSTALL_COMMAND ${CMAKE_COMMAND} -Dinstall_dir=<INSTALL_DIR> -Dsource_dir=<SOURCE_DIR>
Expand Down

0 comments on commit e46ea70

Please sign in to comment.