Skip to content
Snippets Groups Projects
Commit cc735182 authored by Feodor Alexandrov's avatar Feodor Alexandrov
Browse files

fix: rebase artifacts

parent 6ac00715
No related branches found
No related tags found
No related merge requests found
......@@ -319,10 +319,10 @@ fn build_tarantool(jsc: Option<&jobserver::Client>, 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 arch = std::env::var("CARGO_CFG_TARGET_ARCH").unwrap();
let lib_dir = format!("{tarantool_build}/third_party/libunwind/src/.libs");
rustc::link_arg(format!("{lib_dir}/libunwind-{arch}.a"));
rustc::link_arg(format!("{lib_dir}/libunwind.a"));
// let arch = std::env::var("CARGO_CFG_TARGET_ARCH").unwrap();
// let lib_dir = format!("{tarantool_build}/third_party/libunwind/src/.libs");
// rustc::link_arg(format!("{lib_dir}/libunwind-{arch}.a"));
// rustc::link_arg(format!("{lib_dir}/libunwind.a"));
}
rustc::link_arg("-lc");
......@@ -336,7 +336,7 @@ fn build_tarantool(jsc: Option<&jobserver::Client>, build_root: &Path) {
rustc::link_lib_dynamic("icuuc");
/* linked with curl on cmake stage */
// rustc::link_lib_dynamic("z");
rustc::link_lib_dynamic("z");
rustc::link_lib_dynamic("curl");
......
tarantool-sys @ b124e8f0
Subproject commit 004ceffaf43974a79b18ca0c514301f661c43050
Subproject commit b124e8f01fafb98bc3005f77b8852d1f699f8666
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