Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Updated aarch64-unknown-linux-gnu rustflags, updated rust Earthly targets #54

Merged
merged 2 commits into from
Oct 25, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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`
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thats not unexpected. The key point is to make sure when your target is built its NOT built with this target. This target can ONLY be used to build the compiler and its tooling.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

But it does not work for nextest, the same issue as with x86_64-unknown-linux-gnu

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nextest is just a tool, its ok to build it with the GNU tools. I hit this with x86 build as well. This is OK to disable for getting nextest to run.

]

[target.aarch64-unknown-linux-musl]
Copy link
Collaborator

@stevenj stevenj Oct 24, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is the target target.aarch64-unknown-linux-musl catalyst-gateway should build with on an apple mac (or any AArch64 based device actually).

Expand Down