Skip to content

Add support for CMAKE_C/CXX_COMPILER_LAUNCHER #474

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

Closed
wants to merge 2 commits into from
Closed

Add support for CMAKE_C/CXX_COMPILER_LAUNCHER #474

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e02f684
Fix _CORROSION_RUST_CARGO_TARGET_UNDERSCORE
LeonMatthesKDAB Jan 10, 2024
880b36c
Add support for CMAKE_C/CXX_COMPILER_LAUNCHER
LeonMatthesKDAB Jan 10, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 12 additions & 3 deletions cmake/Corrosion.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -512,8 +512,8 @@ set(_CORROSION_RUSTC "${RUSTC_EXECUTABLE}" CACHE INTERNAL "Path to rustc used b
set(_CORROSION_CARGO "${CARGO_EXECUTABLE}" CACHE INTERNAL "Path to cargo used by corrosion")

string(REPLACE "-" "_" _CORROSION_RUST_CARGO_TARGET_UNDERSCORE "${Rust_CARGO_TARGET}")
set(_CORROSION_RUST_CARGO_TARGET_UNDERSCORE "${_CORROSION_RUST_CARGO_TARGET_UNDERSCORE}" CACHE INTERNAL "lowercase target triple with underscores")
string(TOUPPER "${_CORROSION_RUST_CARGO_TARGET_UNDERSCORE}" _CORROSION_TARGET_TRIPLE_UPPER)
set(_CORROSION_RUST_CARGO_TARGET_UNDERSCORE ${Rust_CARGO_TARGET} CACHE INTERNAL "lowercase target triple with underscores")
set(_CORROSION_RUST_CARGO_TARGET_UPPER
"${_CORROSION_TARGET_TRIPLE_UPPER}"
CACHE INTERNAL
Expand Down Expand Up @@ -676,13 +676,22 @@ function(_add_cargo_build out_cargo_build_out_dir)
set(corrosion_cc_rs_flags)

if(CMAKE_C_COMPILER)
set(_CORROSION_C_COMPILER "${CMAKE_C_COMPILER}")
if(CMAKE_C_COMPILER_LAUNCHER)
set(_CORROSION_C_COMPILER "${CMAKE_C_COMPILER_LAUNCHER} ${_CORROSION_C_COMPILER}")
endif()

# This variable is read by cc-rs (often used in build scripts) to determine the c-compiler.
# It can still be overridden if the user sets the non underscore variant via the environment variables
# on the target.
list(APPEND corrosion_cc_rs_flags "CC_${_CORROSION_RUST_CARGO_TARGET_UNDERSCORE}=${CMAKE_C_COMPILER}")
list(APPEND corrosion_cc_rs_flags "CC_${_CORROSION_RUST_CARGO_TARGET_UNDERSCORE}=${_CORROSION_C_COMPILER}")
endif()
if(CMAKE_CXX_COMPILER)
list(APPEND corrosion_cc_rs_flags "CXX_${_CORROSION_RUST_CARGO_TARGET_UNDERSCORE}=${CMAKE_CXX_COMPILER}")
set(_CORROSION_CXX_COMPILER "${CMAKE_CXX_COMPILER}")
if(CMAKE_CXX_COMPILER_LAUNCHER)
set(_CORROSION_CXX_COMPILER "${CMAKE_CXX_COMPILER_LAUNCHER} ${_CORROSION_CXX_COMPILER}")
endif()
list(APPEND corrosion_cc_rs_flags "CXX_${_CORROSION_RUST_CARGO_TARGET_UNDERSCORE}=${_CORROSION_CXX_COMPILER}")
endif()
# cc-rs doesn't seem to support `llvm-ar` (commandline syntax), wo we might as well just use
# the default AR.
Expand Down