From 17c641b6746cef36c8a370b9711278167cef1f77 Mon Sep 17 00:00:00 2001 From: Leif Walsh Date: Wed, 17 Apr 2013 00:00:26 -0400 Subject: [PATCH] [t:4846] merging 4846 branch. git-svn-id: file:///svn/toku/tokudb@43235 c7de825b-a66e-492c-adef-691d508d4ae1 --- cmake_modules/TokuSetupCompiler.cmake | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/cmake_modules/TokuSetupCompiler.cmake b/cmake_modules/TokuSetupCompiler.cmake index 98475b0c22a..560c7dbdf5f 100644 --- a/cmake_modules/TokuSetupCompiler.cmake +++ b/cmake_modules/TokuSetupCompiler.cmake @@ -103,6 +103,8 @@ if(CMAKE_C_COMPILER_ID MATCHES "^Intel$") string(REGEX REPLACE ";" "," intel_warning_string "${intel_warnings}") 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 - link_libraries(imf m) + # make sure intel libs are linked statically + 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()