Use CMAKE_xx_COMPILER when building external dependencies (#636)

dyninst · Oct 4, 2019 · af01eab · af01eab
1 parent b69554b
commit af01eab
Show file tree

Hide file tree

Showing 5 changed files with 27 additions and 2 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -17,13 +17,15 @@ set(RT_BINARY_DIR ${PROJECT_BINARY_DIR}/dyninstAPI_RT)
 
 set (CMAKE_MODULE_PATH "${DYNINST_ROOT}/cmake" "${DYNINST_ROOT}/cmake/Modules" ${CMAKE_MODULE_PATH})
 
+# This needs to be done first to set the global compiler flags
+include(shared)
+
 find_package(ThreadDB)
 find_package(Threads)
 include(Boost)
 include(ThreadingBuildingBlocks)
 include(ElfUtils)
 include(LibIberty)
-include (${DYNINST_ROOT}/cmake/shared.cmake)
 
 configure_file(cmake/version.h.in common/h/dyninstversion.h)
 include_directories(${PROJECT_BINARY_DIR})

diff --git a/cmake/Boost.cmake b/cmake/Boost.cmake
@@ -222,7 +222,7 @@ else()
     PREFIX ${CMAKE_BINARY_DIR}/boost
     URL http://downloads.sourceforge.net/project/boost/boost/${_boost_download_version}/boost_${_boost_download_filename}.zip
     BUILD_IN_SOURCE 1
-    CONFIGURE_COMMAND ${BOOST_BOOTSTRAP} --prefix=${Boost_ROOT_DIR} --with-libraries=${_boost_lib_names}
+    CONFIGURE_COMMAND CC=${CMAKE_C_COMPILER} CXX=${CMAKE_CXX_COMPILER} ${BOOST_BOOTSTRAP} --prefix=${Boost_ROOT_DIR} --with-libraries=${_boost_lib_names}
     BUILD_COMMAND ${BOOST_BUILD} ${BOOST_ARGS} install
     INSTALL_COMMAND ""
   )

diff --git a/cmake/ElfUtils.cmake b/cmake/ElfUtils.cmake
@@ -99,6 +99,10 @@ else()
   message(STATUS "${ElfUtils_ERROR_REASON}")
   message( STATUS "Attempting to build elfutils(${_elfutils_download_version}) as external project")
 
+  if(NOT (${CMAKE_CXX_COMPILER_ID} STREQUAL "GNU") OR NOT (${CMAKE_C_COMPILER_ID} STREQUAL "GNU"))
+    message(FATAL_ERROR "ElfUtils will only build with the GNU compiler")
+  endif()
+
   include(ExternalProject)
   externalproject_add(
     ElfUtils
@@ -107,6 +111,7 @@ else()
     BUILD_IN_SOURCE 1
     CONFIGURE_COMMAND
       CFLAGS=-g
+      CC=${CMAKE_C_COMPILER} CXX=${CMAKE_CXX_COMPILER}
       <SOURCE_DIR>/configure
       --enable-install-elfh
       --prefix=${CMAKE_INSTALL_PREFIX}

diff --git a/cmake/LibIberty.cmake b/cmake/LibIberty.cmake
@@ -72,6 +72,7 @@ else()
     BUILD_IN_SOURCE 1
     CONFIGURE_COMMAND
       CFLAGS=-fPIC
+      CC=${CMAKE_C_COMPILER} CXX=${CMAKE_CXX_COMPILER}
       <SOURCE_DIR>/configure --prefix=${CMAKE_BINARY_DIR}/binutils
     BUILD_COMMAND make
     INSTALL_DIR ${CMAKE_INSTALL_PREFIX}/lib/libiberty

diff --git a/cmake/ThreadingBuildingBlocks.cmake b/cmake/ThreadingBuildingBlocks.cmake
@@ -108,6 +108,12 @@ else()
     message(FATAL_ERROR "Building TBB from source is not supported on this platform")
   endif()
 
+  if(${CMAKE_CXX_COMPILER_ID} STREQUAL "Clang")
+  	if(${_tbb_download_version} VERSION_LESS "2019.7")
+  		message(FATAL_ERROR "Building TBB from source with clang requires TBB 2019.7 or newer")
+  	endif()
+  endif()
+
   # Forcibly update the cache variables
   set(TBB_ROOT_DIR ${CMAKE_INSTALL_PREFIX} CACHE PATH "TBB root directory" FORCE)
   set(TBB_INCLUDE_DIRS ${TBB_ROOT_DIR}/include CACHE PATH "TBB include directory" FORCE)
@@ -143,17 +149,28 @@ else()
 
   include(ExternalProject)
   set(_tbb_prefix_dir ${CMAKE_BINARY_DIR}/tbb)
+
+  # Set the compiler for TBB
+  # It assumes gcc and tests for Intel, so clang is the only
+  # one that needs special treatment.
+  set(_tbb_compiler "")
+  if(${CMAKE_CXX_COMPILER_ID} STREQUAL "Clang")
+  	set(_tbb_compiler "clang")
+  endif()
+
   ExternalProject_Add(
     TBB
     PREFIX ${_tbb_prefix_dir}
     URL https://github.com/01org/tbb/archive/${_tbb_ver_major}_U${_tbb_ver_minor}.tar.gz
     BUILD_IN_SOURCE 1
     CONFIGURE_COMMAND ""
     BUILD_COMMAND
+      CC=${CMAKE_C_COMPILER} CXX=${CMAKE_CXX_COMPILER}
       $(MAKE) -C src
       ${_tbb_components_cfg}
       tbb_build_dir=${_tbb_prefix_dir}/src
       tbb_build_prefix=tbb
+      compiler=${_tbb_compiler}
     INSTALL_COMMAND
       ${CMAKE_COMMAND}
       	-DLIBDIR=${TBB_LIBRARY_DIRS}