Skip to content

Commit

Permalink
Merge pull request #54 from input-output-hk/fix/rust-build
Browse files Browse the repository at this point in the history
Updated aarch64-unknown-linux-gnu rustflags, updated rust Earthly targets
  • Loading branch information
stevenj authored Oct 25, 2023
2 parents df32751 + 7ade3c1 commit bf23f97
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 10 deletions.
9 changes: 1 addition & 8 deletions earthly/rust/Earthfile
Original file line number Diff line number Diff line change
Expand Up @@ -74,9 +74,6 @@ RUST_SETUP:

# Install tools we use commonly with `cargo`.
RUN cargo install cargo-nextest --locked && \
cargo install cargo-chef --locked && \
cargo install kani-verifier --locked && \
cargo kani setup && \
cargo install refinery_cli --locked && \
cargo install cargo-machete --locked

Expand All @@ -94,10 +91,6 @@ check:
cargo clippy --version && \
cargo +nightly clippy --version && \
cargo nextest --version && \
cargo chef --version && \
cargo kani --version && \
cargo machete --version \
refinery --version && \
mold --version



4 changes: 2 additions & 2 deletions earthly/rust/config.toml
Original file line number Diff line number Diff line change
Expand Up @@ -13,14 +13,14 @@ rustflags = [
linker = "clang"
rustflags = [
"-C", "link-arg=-fuse-ld=/usr/bin/mold",
# "-C", "target-feature=+crt-static" - Doesn't work for nextest.
# "-C", "target-feature=+crt-static" - proc-macro doesn't work with it. `https://github.com/rust-lang/rust/issues/78210`
]

[target.aarch64-unknown-linux-gnu]
linker = "clang"
rustflags = [
"-C", "link-arg=-fuse-ld=/usr/bin/mold",
"-C", "target-feature=+crt-static"
# "-C", "target-feature=+crt-static" - proc-macro doesn't work with it. `https://github.com/rust-lang/rust/issues/78210`
]

[target.aarch64-unknown-linux-musl]
Expand Down

0 comments on commit bf23f97

Please sign in to comment.