From dd74d5bf9ab88c29cdd86bc97d61977add2ca8cf Mon Sep 17 00:00:00 2001 From: Guillaume Fraux Date: Tue, 16 Jun 2026 13:56:37 +0200 Subject: [PATCH] Cleanup CMake code calling cargo --- metatomic-core/CMakeLists.txt | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/metatomic-core/CMakeLists.txt b/metatomic-core/CMakeLists.txt index 717e52e81..6a2169173 100644 --- a/metatomic-core/CMakeLists.txt +++ b/metatomic-core/CMakeLists.txt @@ -356,9 +356,6 @@ set(CARGO_ENV "METATOMIC_FULL_VERSION=${METATOMIC_FULL_VERSION}") if (NOT "${CMAKE_OSX_DEPLOYMENT_TARGET}" STREQUAL "") list(APPEND CARGO_ENV "MACOSX_DEPLOYMENT_TARGET=${CMAKE_OSX_DEPLOYMENT_TARGET}") endif() -if (NOT "$ENV{RUSTC_WRAPPER}" STREQUAL "") - list(APPEND CARGO_ENV "RUSTC_WRAPPER=$ENV{RUSTC_WRAPPER}") -endif() if (METATOMIC_INSTALL_BOTH_STATIC_SHARED) set(CARGO_BUILD_ARG "${CARGO_BUILD_ARG};--crate-type=cdylib;--crate-type=staticlib") @@ -389,7 +386,7 @@ endif() add_custom_command( OUTPUT ${CARGO_OUTPUTS} COMMAND ${CMAKE_COMMAND} -E env ${CARGO_ENV} - cargo rustc ${CARGO_BUILD_ARG} -- ${CARGO_RUSTC_ARGS} + ${CARGO_EXE} rustc ${CARGO_BUILD_ARG} -- ${CARGO_RUSTC_ARGS} WORKING_DIRECTORY ${PROJECT_SOURCE_DIR} DEPENDS ${ALL_RUST_SOURCES} COMMENT "Building ${FILE_CREATED_MESSAGE} with cargo"