Update roc build --target to add more triples
#5577
Merged
Conversation
This file contains 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
rtfeldman
commented
Jun 20, 2023
| @@ -1275,83 +1273,3 @@ fn run_wasm<I: Iterator<Item = S>, S: AsRef<[u8]>>(wasm_path: &std::path::Path, | |||
| fn run_wasm<I: Iterator<Item = S>, S: AsRef<[u8]>>(_wasm_path: &std::path::Path, _args: I) { | |||
| println!("Running wasm files is not supported on this target."); | |||
| } | |||
|
|
|||
| #[derive(Debug, Copy, Clone, EnumIter, IntoStaticStr, PartialEq, Eq, Default)] | |||
| pub enum Target { | |||
There was a problem hiding this comment.
I moved all of this to roc_target, so that it could remove some hardcoded constants which didn't agree with this.
rtfeldman
commented
Jun 20, 2023
| pub const MACOS_X86_64_TARGET_STR: &str = "macos-x86_64"; | ||
| pub const WINDOWS_X86_64_TARGET_STR: &str = "windows-x86_64"; | ||
| pub const WINDOWS_X86_32_TARGET_STR: &str = "windows-x86_32"; | ||
| pub const WIDNOWS_ARM64_TARGET_STR: &str = "windows-arm64"; |
There was a problem hiding this comment.
These constants differed from the CLI flags, which meant that .rh files had different names from what was specified on the command line. Now they're consistent, and Target is the single source of truth for these strings.
rtfeldman
force-pushed
the
linux64
branch
5 times, most recently
from
638b87b
to
6315c15
Compare
This reverts commit f6a6bff.
There's an open design question as to whether we want to commit to supporting this, so dropping the comment.
This breaks certain use cases of building with --no-link and an aarch64 target and then linking with lld (via zig cc) (see "aarch64 linux target" thread on Zulip) Also it seems to be unnecessary in practice on LLVM 13, as the comment suggests!
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Now the CLI supports all of these
--targetflags:linux-x64linux-x32linux-arm64macos-x64macos-arm64windows-x64wasm32The naming scheme is not exactly what clang and friends use, but it is designed to:
amd64like Docker uses. Nobody talks much about 32-bit x86 anymore, so just call itx32for symmetry withx64.)gnuormusl- not applicable because we don't require libc).unknownsince it's implied.x32, noti386, and in the futurearm32overarm).This also changes the naming scheme for precompiled
.rhfiles to be consistent with this naming system. (As it happens, only x64 targets changed names, so by coincidence the existing tarballs will continue to work on other architectures. This PR includes a backwards compatibility check which special-casesx86_64as a synonym forx64in these filenames. Eventually new versions ofbasic-clietc will be published with the new filenames, the tutorial will be updated, and this fixup can be removed.)