mirror of
https://github.com/dani-garcia/vaultwarden.git
synced 2026-03-12 01:45:56 -05:00
[PR #2397] [MERGED] Fix building mimalloc on armv6 #6726
Reference in New Issue
Block a user
Delete Branch "%!s()"
Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?
📋 Pull Request Information
Original PR: https://github.com/dani-garcia/vaultwarden/pull/2397
Author: @BlackDex
Created: 3/27/2022
Status: ✅ Merged
Merged: 3/27/2022
Merged by: @dani-garcia
Base:
main← Head:fix-mimalloc-build📝 Commits (1)
d98f95fFix building mimalloc on armv6📊 Changes
9 files changed (+20 additions, -21 deletions)
View changed files
📝
docker/Dockerfile.j2(+4 -5)📝
docker/amd64/Dockerfile.alpine(+0 -1)📝
docker/amd64/Dockerfile.buildx.alpine(+0 -1)📝
docker/arm64/Dockerfile.alpine(+2 -2)📝
docker/arm64/Dockerfile.buildx.alpine(+2 -2)📝
docker/armv6/Dockerfile.alpine(+4 -2)📝
docker/armv6/Dockerfile.buildx.alpine(+4 -2)📝
docker/armv7/Dockerfile.alpine(+2 -3)📝
docker/armv7/Dockerfile.buildx.alpine(+2 -3)📄 Description
The armv6 builds need a specific location for the libatomic.a file.
This commit fixes that by adding a RUSTFLAGS argument for this.
Also removed the
link-arg=-ssince this is now already done during via the release profileAnd removed the CFLAGS for armv7, this is already fixed by default in the blackdex/rust-musl images.
🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.