Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
P
picodata
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Container Registry
Model registry
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
core
picodata
Commits
cc735182
Commit
cc735182
authored
1 year ago
by
Feodor Alexandrov
Browse files
Options
Downloads
Patches
Plain Diff
fix: rebase artifacts
parent
6ac00715
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
build.rs
+5
-5
5 additions, 5 deletions
build.rs
tarantool-sys
+1
-1
1 addition, 1 deletion
tarantool-sys
with
6 additions
and
6 deletions
build.rs
+
5
−
5
View file @
cc735182
...
...
@@ -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"
);
...
...
This diff is collapsed.
Click to expand it.
tarantool-sys
@
b124e8f0
Subproject commit
004ceffaf43974a79b18ca0c514301f661c43050
Subproject commit
b124e8f01fafb98bc3005f77b8852d1f699f8666
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment