Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
conduwuit
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Service Desk
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
🥺
conduwuit
Commits
acf1585f
Unverified
Commit
acf1585f
authored
3 years ago
by
Maxim De Clercq
Browse files
Options
Downloads
Patches
Plain Diff
fix: make sure that libatomic is linked statically
parent
067fcfc0
No related branches found
No related tags found
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
cross/build.sh
+1
-1
1 addition, 1 deletion
cross/build.sh
with
1 addition
and
1 deletion
cross/build.sh
+
1
−
1
View file @
acf1585f
...
@@ -18,7 +18,7 @@ ENV TARGET_PREFIX="/usr/local/$(echo "${TARGET:?}" | sed -e 's/armv7/arm/' -e 's
...
@@ -18,7 +18,7 @@ ENV TARGET_PREFIX="/usr/local/$(echo "${TARGET:?}" | sed -e 's/armv7/arm/' -e 's
# See https://github.com/alexcrichton/cc-rs#external-configuration-via-environment-variables for more information
# See https://github.com/alexcrichton/cc-rs#external-configuration-via-environment-variables for more information
ENV RUSTFLAGS="-L
\$
TARGET_PREFIX/lib" CXXSTDLIB="static=stdc++"
ENV RUSTFLAGS="-L
\$
TARGET_PREFIX/lib" CXXSTDLIB="static=stdc++"
# Forcefully linking against libatomic, libc and libgcc is required for arm32, otherwise symbols are missing
# Forcefully linking against libatomic, libc and libgcc is required for arm32, otherwise symbols are missing
$(
[[
$TARGET
=
~ arm
]]
&&
echo
'ENV RUSTFLAGS="$RUSTFLAGS -Clink-arg=-
l
gcc -Clink-arg=-latomic -lstatic=c"'
)
$(
[[
$TARGET
=
~ arm
]]
&&
echo
'ENV RUSTFLAGS="$RUSTFLAGS -Clink-arg=-
static-lib
gcc -Clink-arg=-l
gcc -lstatic=
atomic -lstatic=c"'
)
# Strip symbols while compiling in release mode
# Strip symbols while compiling in release mode
$(
[[
$@
=
~
-r
]]
&&
echo
'ENV RUSTFLAGS="$RUSTFLAGS -Clink-arg=-s"'
)
$(
[[
$@
=
~
-r
]]
&&
echo
'ENV RUSTFLAGS="$RUSTFLAGS -Clink-arg=-s"'
)
...
...
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