File tree Expand file tree Collapse file tree 1 file changed +3
-3
lines changed
source/loaders/rs_loader/rust Expand file tree Collapse file tree 1 file changed +3
-3
lines changed Original file line number Diff line number Diff line change @@ -49,12 +49,12 @@ add_custom_target(${target}_runtime
4949
5050add_custom_target (${target} ALL
5151 WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
52- COMMAND ${CARGO_EXECUTABLE } build ${TARGET_BUILD_TYPE}
52+ COMMAND ${Rust_CARGO_EXECUTABLE } build ${TARGET_BUILD_TYPE}
5353 # TODO: $ORIGIN does not work, but even using absolute path, the library librustc_driver depends on libstd and libLLVM
5454 # but they have the rpath hardcoded to the rustup folder, for mitigating this, we are using LD_LIBRARY_PATH in the test
5555 # although it may cause problems in the future in the distributable or docker builds, this must be reviewed
56- # COMMAND ${CMAKE_COMMAND} -E env RUSTFLAGS='-C link-arg=-Wl,-rpath,${TARGET_OUTPUT_PATH}' ${CARGO_EXECUTABLE } build ${TARGET_BUILD_TYPE}
57- # COMMAND ${CMAKE_COMMAND} -E env RUSTFLAGS='-C link-arg=-Wl,-rpath,\$ORIGIN' ${CARGO_EXECUTABLE } build ${TARGET_BUILD_TYPE}
56+ # COMMAND ${CMAKE_COMMAND} -E env RUSTFLAGS='-C link-arg=-Wl,-rpath,${TARGET_OUTPUT_PATH}' ${Rust_CARGO_EXECUTABLE } build ${TARGET_BUILD_TYPE}
57+ # COMMAND ${CMAKE_COMMAND} -E env RUSTFLAGS='-C link-arg=-Wl,-rpath,\$ORIGIN' ${Rust_CARGO_EXECUTABLE } build ${TARGET_BUILD_TYPE}
5858 COMMAND ${CMAKE_COMMAND} -E copy_if_different ${TARGET_BUILD_PATH} ${TARGET_OUTPUT}
5959 DEPENDS ${target} _runtime
6060)
You can’t perform that action at this time.
0 commit comments