Skip to content
Snippets Groups Projects
Commit 6a4a766d authored by Georgy Moshkin's avatar Georgy Moshkin :speech_balloon:
Browse files

build: rebase tarantool-sys onto 2.11.0-rc2

parent c10ccaed
No related branches found
No related tags found
1 merge request!498build: rebase tarantool-sys onto 2.11.0-rc2
Pipeline #17326 passed
......@@ -250,7 +250,6 @@ fn build_tarantool(build_root: &Path) {
rustc::link_lib_static("box_error");
rustc::link_lib_static("xlog");
rustc::link_lib_static("crc32");
rustc::link_lib_static("scramble");
rustc::link_lib_static("stat");
rustc::link_lib_static("shutdown");
rustc::link_lib_static("swim_udp");
......@@ -269,7 +268,7 @@ fn build_tarantool(build_root: &Path) {
// These two must be linked as positional arguments, because they define
// duplicate symbols which is not allowed (by default) when linking with
// via -l... option
let lib_dir = format!("{b}/{tarantool_prefix}/build/libunwind/dest/lib");
let lib_dir = format!("{b}/{tarantool_prefix}/third_party/libunwind/src/.libs");
rustc::link_arg(format!("{lib_dir}/libunwind-x86_64.a"));
rustc::link_arg(format!("{lib_dir}/libunwind.a"));
}
......
......@@ -5,7 +5,7 @@ RUN set -e; \
apt install -y \
build-essential \
git unzip wget curl\
cmake make \
libtool autoconf cmake make \
python3 \
python3-yaml \
python3-six \
......
tarantool-sys @ a2c6bae6
Subproject commit 9912156edff232522ac35b950199fdb00654e772
Subproject commit a2c6bae6a2ba068f42e14a7b37a2e73882efc233
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment