Date: Tue, 12 Oct 2021 14:08:26 GMT From: Ganael LAPLANCHE <martymac@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 5d7ca4100448 - main - devel/onetbb: Fix build on 13-STABLE and 14-CURRENT (i386) Message-ID: <202110121408.19CE8Q87016381@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by martymac: URL: https://cgit.FreeBSD.org/ports/commit/?id=5d7ca410044831cf4cbfb639fdead1feb9a69e3b commit 5d7ca410044831cf4cbfb639fdead1feb9a69e3b Author: Ganael LAPLANCHE <martymac@FreeBSD.org> AuthorDate: 2021-10-12 14:07:13 +0000 Commit: Ganael LAPLANCHE <martymac@FreeBSD.org> CommitDate: 2021-10-12 14:08:07 +0000 devel/onetbb: Fix build on 13-STABLE and 14-CURRENT (i386) --- devel/onetbb/files/patch-cmake-compilers-Clang.cmake | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/devel/onetbb/files/patch-cmake-compilers-Clang.cmake b/devel/onetbb/files/patch-cmake-compilers-Clang.cmake index bf6019201e2c..59fd4f11702b 100644 --- a/devel/onetbb/files/patch-cmake-compilers-Clang.cmake +++ b/devel/onetbb/files/patch-cmake-compilers-Clang.cmake @@ -1,4 +1,6 @@ -Fix amd64 build for 13-STABLE and 14-CURRENT (clang >= 12.0.1) +Fix build on 13-STABLE and 14-CURRENT + +See: https://github.com/oneapi-src/oneTBB/pull/614 --- cmake/compilers/Clang.cmake.orig 2021-10-04 09:50:18 UTC +++ cmake/compilers/Clang.cmake @@ -7,7 +9,7 @@ Fix amd64 build for 13-STABLE and 14-CURRENT (clang >= 12.0.1) # Enable Intel(R) Transactional Synchronization Extensions (-mrtm) and WAITPKG instructions support (-mwaitpkg) on relevant processors -if (CMAKE_SYSTEM_PROCESSOR MATCHES "(x86|AMD64)") -+if (CMAKE_SYSTEM_PROCESSOR MATCHES "(x86|AMD64|amd64)") ++if (CMAKE_SYSTEM_PROCESSOR MATCHES "(x86|AMD64|amd64|i.86)") set(TBB_COMMON_COMPILE_FLAGS ${TBB_COMMON_COMPILE_FLAGS} -mrtm $<$<NOT:$<VERSION_LESS:${CMAKE_CXX_COMPILER_VERSION},12.0>>:-mwaitpkg>) endif()
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202110121408.19CE8Q87016381>