Use the same rust-toolchain for all Rust sub-projects (#7200)

close #7198
pingcap · Mar 31, 2023 · 7821664 · 7821664
1 parent 5940685
commit 7821664
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 3 deletions.
diff --git a/contrib/tiflash-proxy-cmake/CMakeLists.txt b/contrib/tiflash-proxy-cmake/CMakeLists.txt
@@ -65,7 +65,7 @@ add_custom_command(OUTPUT ${_TIFLASH_PROXY_LIBRARY}
     WORKING_DIRECTORY ${_TIFLASH_PROXY_SOURCE_DIR}
     DEPENDS "${_TIFLASH_PROXY_SRCS}"
             "${_TIFLASH_PROXY_SOURCE_DIR}/Cargo.lock"
-            "${_TIFLASH_PROXY_SOURCE_DIR}/rust-toolchain")
+            "${TiFlash_SOURCE_DIR}/rust-toolchain")
 
 add_custom_target(tiflash_proxy ALL DEPENDS ${_TIFLASH_PROXY_LIBRARY})
 add_library(libtiflash_proxy SHARED IMPORTED GLOBAL)

diff --git a/libs/libsymbolization/CMakeLists.txt b/libs/libsymbolization/CMakeLists.txt
@@ -31,7 +31,7 @@ add_custom_command(OUTPUT ${_SYMBOLIZATION_LIBRARY}
                 "${_SYMBOLIZATION_HEADERS}"
                 "${_SYMBOLIZATION_SOURCE_DIR}/Cargo.lock"
                 "${_SYMBOLIZATION_SOURCE_DIR}/Cargo.toml"
-                "${_SYMBOLIZATION_SOURCE_DIR}/rust-toolchain")
+                "${TiFlash_SOURCE_DIR}/rust-toolchain")
 
 add_custom_target(symbolization ALL DEPENDS ${_SYMBOLIZATION_LIBRARY})
 add_library(libsymbolization STATIC IMPORTED GLOBAL)

diff --git a/libs/libsymbolization/rust-toolchain b/libs/libsymbolization/rust-toolchain
diff --git a/rust-toolchain b/rust-toolchain
@@ -0,0 +1 @@
+contrib/tiflash-proxy/rust-toolchain