From 70be4645d30c8017524ae2b444ac7e0c0a8448a6 Mon Sep 17 00:00:00 2001 From: KyleMiles Date: Tue, 29 Jun 2021 11:35:06 -0400 Subject: Rust API : No longer update to latest cargo nightly; Add link args back to -sys to reduce build errors --- rust/examples/basic_script/CMakeLists.txt | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) (limited to 'rust/examples/basic_script/CMakeLists.txt') diff --git a/rust/examples/basic_script/CMakeLists.txt b/rust/examples/basic_script/CMakeLists.txt index 51adb923..cb44180b 100644 --- a/rust/examples/basic_script/CMakeLists.txt +++ b/rust/examples/basic_script/CMakeLists.txt @@ -29,7 +29,7 @@ add_custom_target(test_headless ALL DEPENDS ${OUTPUT_PATH}) add_dependencies(test_headless binaryninjaapi) find_program(RUSTUP_PATH rustup REQUIRED HINTS ~/.cargo/bin) -set(INSTALL_UPDATE_NIGHTLY ${RUSTUP_PATH} install nightly) +set(RUSTUP_COMMAND ${RUSTUP_PATH} run ${CARGO_API_VERSION} cargo build) if(APPLE) if(UNIVERSAL) @@ -43,13 +43,12 @@ if(APPLE) add_custom_command( OUTPUT ${OUTPUT_PATH} - COMMAND ${INSTALL_UPDATE_NIGHTLY} COMMAND ${CMAKE_COMMAND} -E env MACOSX_DEPLOYMENT_TARGET=10.14 LIBCLANG_PATH=${LLVM_PATH}/lib LLVM_VERSION=${LLVM_VERSION} BINARYNINJADIR=${BN_CORE_OUTPUT_DIR} - ${RUSTUP_PATH} run nightly cargo build --target=aarch64-apple-darwin ${CARGO_OPTS} + ${RUSTUP_COMMAND} --target=aarch64-apple-darwin ${CARGO_OPTS} COMMAND ${CMAKE_COMMAND} -E env MACOSX_DEPLOYMENT_TARGET=10.14 LIBCLANG_PATH=${LLVM_PATH}/lib LLVM_VERSION=${LLVM_VERSION} BINARYNINJADIR=${BN_CORE_OUTPUT_DIR} - ${RUSTUP_PATH} run nightly cargo build --target=x86_64-apple-darwin ${CARGO_OPTS} + ${RUSTUP_COMMAND} --target=x86_64-apple-darwin ${CARGO_OPTS} COMMAND cp ${AARCH64_LIB_PATH} ${OUTPUT_PATH}-aarch COMMAND cp ${X86_64_LIB_PATH} ${OUTPUT_PATH} WORKING_DIRECTORY ${PROJECT_SOURCE_DIR} @@ -63,10 +62,9 @@ if(APPLE) add_custom_command( OUTPUT ${OUTPUT_PATH} - COMMAND ${INSTALL_UPDATE_NIGHTLY} COMMAND ${CMAKE_COMMAND} -E env MACOSX_DEPLOYMENT_TARGET=10.14 LIBCLANG_PATH=${LLVM_PATH}/lib LLVM_VERSION=${LLVM_VERSION} BINARYNINJADIR=${BN_CORE_OUTPUT_DIR} - ${RUSTUP_PATH} run nightly cargo build --target=x86_64-apple-darwin ${CARGO_OPTS} + ${RUSTUP_COMMAND} --target=x86_64-apple-darwin ${CARGO_OPTS} COMMAND cp ${X86_64_LIB_PATH} ${OUTPUT_PATH} WORKING_DIRECTORY ${PROJECT_SOURCE_DIR} DEPENDS ${PLUGIN_SOURCES} ${API_SOURCES}) @@ -74,20 +72,18 @@ if(APPLE) elseif(WIN32) add_custom_command( OUTPUT ${OUTPUT_PATH} - COMMAND ${INSTALL_UPDATE_NIGHTLY} COMMAND ${CMAKE_COMMAND} -E env LIBCLANG_PATH=${LLVM_PATH}/lib LLVM_VERSION=${LLVM_VERSION} BINARYNINJADIR=${BN_CORE_OUTPUT_DIR} - ${RUSTUP_PATH} run nightly cargo build ${CARGO_OPTS} + ${RUSTUP_COMMAND} ${CARGO_OPTS} COMMAND cp ${TARGET_DIR}/${OUTPUT_FILE} ${OUTPUT_PATH} WORKING_DIRECTORY ${PROJECT_SOURCE_DIR} DEPENDS ${PLUGIN_SOURCES} ${API_SOURCES}) else() add_custom_command( OUTPUT ${OUTPUT_PATH} - COMMAND ${INSTALL_UPDATE_NIGHTLY} COMMAND ${CMAKE_COMMAND} -E env LIBCLANG_PATH=${LLVM_PATH}/lib LLVM_VERSION=${LLVM_VERSION} BINARYNINJADIR=${BN_CORE_OUTPUT_DIR} - ${RUSTUP_PATH} run nightly cargo build ${CARGO_OPTS} + ${RUSTUP_COMMAND} ${CARGO_OPTS} COMMAND cp ${TARGET_DIR}/${OUTPUT_FILE} ${OUTPUT_PATH} WORKING_DIRECTORY ${PROJECT_SOURCE_DIR} DEPENDS ${PLUGIN_SOURCES} ${API_SOURCES}) -- cgit v1.3.1