Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

cmake: BuildBoost.cmake: use specified compiler for building boost #19898

Merged
merged 1 commit into from
Jan 11, 2018
Merged

cmake: BuildBoost.cmake: use specified compiler for building boost #19898

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
29 changes: 12 additions & 17 deletions cmake/modules/BuildBoost.cmake
View file
Open in desktop
Expand Up @@ -49,24 +49,14 @@ function(do_build_boost version)
list(APPEND b2 -d0)
endif()

if(NOT CMAKE_HOST_SYSTEM_PROCESSOR STREQUAL CMAKE_SYSTEM_PROCESSOR)
# we are crosscompiling
if(CMAKE_CXX_COMPILER_ID STREQUAL GNU)
set(b2_cc gcc)
elseif(CMAKE_CXX_COMPILER_ID STREQUAL Clang)
set(b2_cc clang)
else()
message(SEND_ERROR "unknown compiler: ${CMAKE_CXX_COMPILER_ID}")
endif()
# edit the config.jam so, b2 will be able to use the specified toolset
execute_process(
COMMAND
sed -i
"s|using ${b2_cc} ;|using ${b2_cc} : ${CMAKE_SYSTEM_PROCESSOR} : ${CMAKE_CXX_COMPILER} ;|"
${PROJECT_SOURCE_DIR}/src/boost/project-config.jam)
# use ${CMAKE_SYSTEM_PROCESSOR} as the version identifier of compiler
list(APPEND b2 toolset=${b2_cc}-${CMAKE_SYSTEM_PROCESSOR})
if(CMAKE_CXX_COMPILER_ID STREQUAL GNU)
set(toolset gcc)
elseif(CMAKE_CXX_COMPILER_ID STREQUAL Clang)
set(toolset clang)
else()
message(SEND_ERROR "unknown compiler: ${CMAKE_CXX_COMPILER_ID}")
endif()
list(APPEND b2 toolset=${toolset})

set(build_command
${b2} headers stage
Expand Down Expand Up @@ -112,6 +102,11 @@ function(do_build_boost version)
BUILD_IN_SOURCE 1
INSTALL_COMMAND ${install_command}
PREFIX "${boost_root_dir}")
ExternalProject_Get_Property(Boost source_dir)
# edit the user-config.jam so, so b2 will be able to use the specified
# toolset
file(WRITE ${source_dir}/user-config.jam
"using ${toolset} : : ${CMAKE_CXX_COMPILER} ;")
endfunction()

macro(build_boost version)
Expand Down