wip

LongJohnCoder · Sep 4, 2022 · ff0679f · ff0679f
1 parent b7bfe41
commit ff0679f
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 4 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -38,6 +38,8 @@ if(MOLD_USE_ASAN)
   target_link_options(mold PRIVATE -fsanitize=address -fsanitize=undefined)
 endif()
 
+target_include_directories(mold PRIVATE "/tmp/openssl/include")
+
 option(MOLD_USE_TSAN "Build mold with ThreadSanitizer" OFF)
 if(MOLD_USE_TSAN)
   target_compile_options(mold PRIVATE -fsanitize=thread)

diff --git a/third-party/tbb/cmake/compilers/GNU.cmake b/third-party/tbb/cmake/compilers/GNU.cmake
@@ -36,10 +36,6 @@ if (NOT CMAKE_GENERATOR MATCHES "Ninja" AND NOT CMAKE_CXX_DEPENDS_USE_COMPILER)
 endif()
 
 # Enable Intel(R) Transactional Synchronization Extensions (-mrtm) and WAITPKG instructions support (-mwaitpkg) on relevant processors
-if (CMAKE_SYSTEM_PROCESSOR MATCHES "(x86|AMD64|amd64|i.86)")
-    set(TBB_COMMON_COMPILE_FLAGS ${TBB_COMMON_COMPILE_FLAGS} -mrtm $<$<AND:$<NOT:$<CXX_COMPILER_ID:Intel>>,$<NOT:$<VERSION_LESS:${CMAKE_CXX_COMPILER_VERSION},11.0>>>:-mwaitpkg>)
-endif()
-
 if (NOT MINGW)
     set(TBB_COMMON_LINK_LIBS dl)
 endif()