rustc: be extremely principled about cross builds #356769
Conversation
nix-owners
bot
requested review from
alyssais,
figsoda,
Mic92,
winterqt and
zowoq
rhelmot
added
the
6.topic: cross-compilation
|
First impressions: This looks significantly more correct. I’m still sceptical of the weird |
wegank
added
the
2.status: merge conflict
There were a lot of collapsed assumptions about the cross build process in this derivation, especially with the overloaded meanings of useLLVM. This diff splits useLLVM into a value for each of the build, host, and target platforms. We also specify more target-specific configure flags, including passing through the llvm-config-native binary which is built in some cross configurations. This also allows us to clean up some hacky NIX_LDFLAGS code. This commit was tested with the following build configurations: * x86_64-freebsd -> x86_64-freebsd -> x86_64-freebsd * x86_64-freebsd -> x86_64-freebsd -> x86_64-linux * x86_64-freebsd -> x86_64-linux -> x86_64-linux * x86_64-freebsd -> x86_64-freebsd -> aarch64-linux * x86_64-freebsd -> aarch64-linux -> aarch64-linux * x86_64-linux -> x86_64-linux -> x86_64-linux * x86_64-linux -> x86_64-linux -> aarch64-linux * x86_64-linux -> aarch64-linux -> aarch64-linux * x86_64-linux -> x86_64-linux -> x86_64-freebsd * x86_64-linux -> x86_64-freebsd -> x86_64-freebsd
|
This looks nice, just make sure rust things build in pkgsLLVM. |
ofborg
bot
added
10.rebuild-darwin: 501+
10.rebuild-linux: 501+
and removed
2.status: merge conflict
| else if withBundledLLVM then | ||
| "in-tree" | ||
| else | ||
| "system" |
There was a problem hiding this comment.
This is repeated three times — maybe a function?
| ] | ||
| else | ||
| [ | ||
| "${setHost}.llvm-config=${llvmShared.dev}/bin/llvm-config-native" |
There was a problem hiding this comment.
I wonder if we should always create llvm-config-native, even in non-cross builds… This is fine for now though!
|
I'll address these review comments in a sec but more importantly Ross' comments reveal that this seems to have broken pkgsLLVM.rustc... the error messages are quite confusing but I'll get to the bottom of it. |
wegank
added
the
12.approvals: 1
There were a lot of collapsed assumptions about the cross build process in this derivation, especially with the overloaded meanings of useLLVM. This diff splits useLLVM into a value for each of the build, host, and target platforms. We also specify more target-specific configure flags, including passing through the llvm-config-native binary which is built in some cross configurations. This also allows us to clean up some hacky NIX_LDFLAGS code.
This commit was tested with the following build configurations:
Please note that darwin is completely absent from this list. I don't have any apple machines!
This PR has several dependencies. I've submitted them all as separate PRs, but some of them target staging and others master. If you'd like to test this branch, please build rhelmot:freebsd-staging-test.
Things done
nix.conf? (See Nix manual)sandbox = relaxedsandbox = truenix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage./result/bin/)Add a 👍 reaction to pull requests you find important.