From 84bafa656bc52a87388041f443dd5e2b54e5dd5b Mon Sep 17 00:00:00 2001 From: tarcila Date: Fri, 1 Nov 2019 16:46:49 -0400 Subject: tbb: Fix compilation on OSX (#8744) * tbb: Fix compilation on OSX Make sure CMake detected sysroot is correctly forwarded to TBB build system so system headers files will be found later on. * tbb: Version bump --- ports/tbb/CMakeLists.txt | 6 +++++- ports/tbb/CONTROL | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/ports/tbb/CMakeLists.txt b/ports/tbb/CMakeLists.txt index 7216e3474..6d41b1555 100644 --- a/ports/tbb/CMakeLists.txt +++ b/ports/tbb/CMakeLists.txt @@ -7,7 +7,11 @@ include(${CMAKE_CURRENT_BINARY_DIR}/src/cmake/TBBBuild.cmake REQUIRED) if(NOT BUILD_SHARED_LIBS) set(TBB_STATIC_INCLUDE extra_inc=big_iron.inc) endif() -tbb_build(TBB_ROOT ${CMAKE_CURRENT_BINARY_DIR}/src MAKE_ARGS ${TBB_STATIC_INCLUDE}) +if(CMAKE_SYSTEM_NAME STREQUAL "Darwin") + set(FORWARD_SDK_ROOT "SDKROOT=${CMAKE_OSX_SYSROOT}") +endif() + +tbb_build(TBB_ROOT ${CMAKE_CURRENT_BINARY_DIR}/src MAKE_ARGS ${TBB_STATIC_INCLUDE} ${FORWARD_SDK_ROOT}) set(SUBDIR ${CMAKE_CURRENT_BINARY_DIR}/tbb_cmake_build/tbb_cmake_build_subdir) if(CMAKE_BUILD_TYPE STREQUAL "Release") diff --git a/ports/tbb/CONTROL b/ports/tbb/CONTROL index da29e4879..a51904261 100644 --- a/ports/tbb/CONTROL +++ b/ports/tbb/CONTROL @@ -1,4 +1,4 @@ Source: tbb -Version: 2019_U8-1 +Version: 2019_U8-2 Homepage: https://github.com/01org/tbb Description: Intel's Threading Building Blocks. -- cgit v1.2.3