Skip to content

M
mariadb
Commit 17c641b6 authored by Leif Walsh's avatar Leif Walsh Committed by Yoni Fogel
Browse files
Options

[t:4846] merging 4846 branch. 

git-svn-id: file:///svn/toku/tokudb@43235 c7de825b-a66e-492c-adef-691d508d4ae1
parent 5a3d586b
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 2 deletions
cmake_modules/TokuSetupCompiler.cmake
View file @ 17c641b6
...@@ -103,6 +103,8 @@ if(CMAKE_C_COMPILER_ID MATCHES "^Intel$") ...@@ -103,6 +103,8 @@ if(CMAKE_C_COMPILER_ID MATCHES "^Intel$")
string(REGEX REPLACE ";" "," intel_warning_string "${intel_warnings}") string(REGEX REPLACE ";" "," intel_warning_string "${intel_warnings}")
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -diag-disable ${intel_warning_string}") set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -diag-disable ${intel_warning_string}")
# make sure to link with both intel's math library and regular -lm # make sure intel libs are linked statically
link_libraries(imf m) set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -static-intel")
set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -static-intel")
set(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -static-intel")
endif() 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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7