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
15a86e82
Verified
Commit
15a86e82
authored
2 years ago
by
Denis Smirnov
Browse files
Options
Downloads
Patches
Plain Diff
fix: bugs in build.rs after rust compiler update
parent
62269c6a
No related branches found
No related tags found
1 merge request
!1414
sbroad import
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
build.rs
+10
-8
10 additions, 8 deletions
build.rs
with
10 additions
and
8 deletions
build.rs
+
10
−
8
View file @
15a86e82
...
...
@@ -37,12 +37,7 @@ fn main() {
.unwrap
();
let
tarantool
=
root
.join
(
"deps"
)
.join
(
"tarantool"
);
let
dec_number
=
tarantool
.join
(
"third_party"
)
.join
(
"decNumber"
);
let
msg_puck
=
tarantool
.join
(
"deps"
)
.join
(
"tarantool"
)
.join
(
"src"
)
.join
(
"lib"
)
.join
(
"msgpuck"
);
let
msg_puck
=
tarantool
.join
(
"src"
)
.join
(
"lib"
)
.join
(
"msgpuck"
);
// We need to configure Tarantool with cmake in order to generate all
// required headers for the further build of the decNumber mocking
...
...
@@ -57,7 +52,14 @@ fn main() {
.status
()
.expect
(
"failed to run cmake"
);
cc
::
Build
::
new
()
.warnings
(
false
)
.warnings
(
true
)
.include
(
msg_puck
.to_str
()
.unwrap
())
.file
(
msg_puck
.join
(
"hints.c"
)
.to_str
()
.unwrap
())
.define
(
"MP_PROTO"
,
Some
(
"inline"
))
.define
(
"MP_IMPL"
,
Some
(
"inline"
))
.compile
(
"libmsgpuck.a"
);
cc
::
Build
::
new
()
.warnings
(
true
)
.include
(
dec_number
.to_str
()
.unwrap
())
.include
(
msg_puck
.to_str
()
.unwrap
())
.include
(
tarantool
.join
(
"third_party"
)
.to_str
()
.unwrap
())
...
...
@@ -89,7 +91,7 @@ fn main() {
.unwrap
(),
)
.define
(
"DECLITEND"
,
Some
(
litend
))
//
do not
inline functions
in
msgpuck.h
for a static library
//
Never define MP_LIBRARY as we need to
inline functions
from
msgpuck.h
.define
(
"MP_LIBRARY"
,
None
)
.compile
(
"libdecNumber.a"
);
}
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