[openwrt-23.05] rust: fix host build on aarch64 darwin#21867
Merged
1715173329 merged 1 commit intoAug 20, 2023
Merged
Conversation
Member
Author
Contributor
|
I'd squash them in 1. |
rust/host failed to compile on macOS running on Apple Silicon M1 Pro because the host target triple is autogenerated to be 'arm64-unknown-linux-'. Rust doesn't have such a target triple, thus the build fails because there are no pre-built artifacts for bootstrapping. Fix this by setting RUSTC_HOST_ARCH to 'aarch64-apple-darwin' in case our host is HOST_ARCH=arm64 and HOST_OS=darwin. Signed-off-by: Jonas Jelonek <jelonek.jonas@gmail.com> (squashed 105fa39 and c287e98)
jonasjelonek
force-pushed
the
23.05-rust-host-fix-aarch64-darwin-build
branch
from
1bdb250 to
44c5da4
Compare
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Maintainer: @lu-zero
Compile tested: yes
Description:
Backport of #21837 and #21845 to OpenWrt 23.05
I wasn't quite sure how to backport this because I had a mistake in the first PR, nevertheless it got merged and then submitted a second PR to fix that. Usually backporting seems to be done just by cherry-picking. Please tell me if that should be done in another way.
(cherry picked from 105fa39 and c287e98)(squashed 105fa39 and c287e98)