mab122
/
radicle-heartwood-lfs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

build: Use zig for linux builds 

There was an issue with the build that is resolved when using zig.
aarch64 binaries had a bug in libgit2 involving file access.
This commit is contained in:
cloudhead 2024-04-30 21:54:48 +02:00
parent eece90e9f7
commit faafd21a91
No known key found for this signature in database
2 changed files with 4 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
build/Dockerfile
View File

@ -7,7 +7,7 @@ COPY . .
# Copy cargo configuration we're going to use to specify compiler options. # Copy cargo configuration we're going to use to specify compiler options.
RUN mkdir -p .cargo && cp build/config.toml .cargo/config.toml RUN mkdir -p .cargo && cp build/config.toml .cargo/config.toml
# Install dependencies. # Install dependencies.
RUN apk update && apk add --no-cache mold clang git musl-dev minisign curl xz asciidoctor RUN apk update && apk add --no-cache git musl-dev minisign curl xz asciidoctor
# Build man pages and strip metadata. Removes all comments, since they include # Build man pages and strip metadata. Removes all comments, since they include
# non-reproducible information, such as version numbers. # non-reproducible information, such as version numbers.
RUN asciidoctor --doctype manpage --backend manpage --destination-dir . *.1.adoc && \ RUN asciidoctor --doctype manpage --backend manpage --destination-dir . *.1.adoc && \
@ -19,16 +19,6 @@ RUN rustup target add \
x86_64-apple-darwin \ x86_64-apple-darwin \
aarch64-apple-darwin aarch64-apple-darwin
# Linux x86_64 and aarch64 build.
ENV CC=clang C_INCLUDE_PATH=/usr/include/x86_64-linux-musl
RUN cargo build --locked --release \
--target=x86_64-unknown-linux-musl \
--target=aarch64-unknown-linux-musl \
-p radicle-node \
-p radicle-httpd \
-p radicle-remote-helper \
-p radicle-cli
# Install dependencies for cross-compiling to macOS. # Install dependencies for cross-compiling to macOS.
# We use Zig as the linker to perform the compilation from a Linux host. # We use Zig as the linker to perform the compilation from a Linux host.
# Zig is not yet available on Debian, so we download the official binary. # Zig is not yet available on Debian, so we download the official binary.
@ -48,10 +38,12 @@ RUN xz -d -c build/macos-sdk-11.3.tar.xz | tar -x
# This env var is used by `cargo-zigbuild` to find the SDK. # This env var is used by `cargo-zigbuild` to find the SDK.
ENV SDKROOT /src/macos-sdk-11.3 ENV SDKROOT /src/macos-sdk-11.3
# Darwin x86_64 and aarch64 build. # Build binaries.
RUN cargo zigbuild --locked --release \ RUN cargo zigbuild --locked --release \
--target=x86_64-apple-darwin \ --target=x86_64-apple-darwin \
--target=aarch64-apple-darwin \ --target=aarch64-apple-darwin \
--target=aarch64-unknown-linux-musl \
--target=x86_64-unknown-linux-musl \
-p radicle-node \ -p radicle-node \
-p radicle-httpd \ -p radicle-httpd \
-p radicle-remote-helper \ -p radicle-remote-helper \

6
build/config.toml
View File

@ -1,18 +1,12 @@
[target.x86_64-unknown-linux-musl] [target.x86_64-unknown-linux-musl]
linker = "clang"
rustflags = [ rustflags = [
"-C", "link-arg=-fuse-ld=mold",
"-C", "link-arg=--target=x86_64-unknown-linux-musl",
"-C", "codegen-units=1", "-C", "codegen-units=1",
"-C", "incremental=false", "-C", "incremental=false",
"-C", "opt-level=3", "-C", "opt-level=3",
] ]
[target.aarch64-unknown-linux-musl] [target.aarch64-unknown-linux-musl]
linker = "clang"
rustflags = [ rustflags = [
"-C", "link-arg=-fuse-ld=mold",
"-C", "link-arg=--target=aarch64-unknown-linux-musl",
"-C", "codegen-units=1", "-C", "codegen-units=1",
"-C", "incremental=false", "-C", "incremental=false",
"-C", "opt-level=3", "-C", "opt-level=3",