Commit 65e99b25 authored by David E. DeMarle's avatar David E. DeMarle

push a workaround for a bug at lanl with tbb 2019

bug showed up on intel compilers on rhel7 machines now that
we've updated tbb. See discussion of the bug at
https://github.com/intel/tbb/issues/158
parent a0e1b362
diff --git a/tbb2019_20190410oss/include/tbb/machine/linux_common.h b/tbb2019_20190410oss/include/tbb/machine/linux_common.h
index 6f93828..93e9726 100644
--- a/tbb2019_20190410oss/include/tbb/machine/linux_common.h
+++ b/tbb2019_20190410oss/include/tbb/machine/linux_common.h
@@ -30,7 +30,7 @@
#define __TBB_USE_FUTEX 1
-#if defined(__has_include)
+#if 0
#define __TBB_has_include __has_include
#else
#define __TBB_has_include(x) 0
......@@ -22,3 +22,9 @@ superbuild_add_project(tbb
superbuild_add_extra_cmake_args(
-DTBB_ROOT:PATH=<INSTALL_DIR>)
if (CMAKE_CXX_COMPILER_ID MATCHES "Intel")
# see discussion at https://github.com/intel/tbb/issues/158
superbuild_apply_patch(tbb disable-futex
"Disable futex to avoid problems on Intel compiler")
endif ()
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment