rustc: Enable profiler on more platforms #314832
Draft
+6
−1
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
|
Wouldn't it be better to assume this works on all platforms except ones where we have a reason to think it doesn't, like Redox? On a platform it doesn't work on, it would be IMO less confusing to get an error about profiler_builtins not building than one about it being missing from the standard library. |
ofborg
bot
added
10.rebuild-darwin: 501+
10.rebuild-darwin: 5001+
10.rebuild-linux: 0
labels
Artturin
force-pushed
the
rustcprofiler
branch
2 times, most recently
from
34dafe9
to
5b7f605
Compare
alyssais
reviewed
May 26, 2024
| @@ -139,7 +139,7 @@ in stdenv.mkDerivation (finalAttrs: { | |||
| "${setBuild}.llvm-config=${llvmSharedForBuild.dev}/bin/llvm-config" | |||
| "${setHost}.llvm-config=${llvmSharedForHost.dev}/bin/llvm-config" | |||
| "${setTarget}.llvm-config=${llvmSharedForTarget.dev}/bin/llvm-config" | |||
| ] ++ optionals (stdenv.isLinux && !stdenv.targetPlatform.isRedox) [ | |||
| ] ++ optionals (stdenv.targetPlatform.isLinux || stdenv.targetPlatform.isDarwin || stdenv.targetPlatform.isAndroid || stdenv.targetPlatform.isFreeBSD || (stdenv.targetPlatform.isWindows && !stdenv.targetPlatform.isMinGW)) [ | |||
There was a problem hiding this comment.
These links in your commit message are great — but maybe they should be in a comment so they can easily be checked and updated?
alyssais
approved these changes
May 26, 2024
Ofborg failed with a timeout in llvm. Tried building on the build box but Error happens without this pr too ( |
|
remove the `isRedox` condition which was added because `stdenv.isLinux` uses `hostPlatform`, after specifying `targetPlatform` it's no longer necessary Sources for the conditionals https://www.github.com/rust-lang/rust/blob/master/src/ci/github-actions/jobs.yml https://www.github.com/rust-lang/rust/blob/5fe554350208b72cb8b66ce39bf0b92b1bba6edd/src/ci/docker/host-x86_64/dist-x86_64-freebsd/Dockerfile#L41 https://www.github.com/search?q=repo%3Arust-lang%2Frust%20%2Fenable-profiler%2F&type=code MinGW excluded because there's an open pr to rust to remove it's `enable-profiler` in `jobs.yml` https://www.github.com/rust-lang/rust/pull/122613/files
Artturin
force-pushed
the
rustcprofiler
branch
from
feb77a1
to
ba7c386
Compare
|
Been a few months so retrying. |
|
New errors |
Artturin
changed the title
|
Split out the |
13 tasks
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.
remove the
isRedoxcondition which was added becausestdenv.isLinuxuseshostPlatform, after specifyingtargetPlatformit's no longer necessaryFor error[E0463]: can't find crate for 'profiler_builtins'
#266570
https://logs.ofborg.org/?key=nixos/nixpkgs.266570&attempt_id=450d0b18-fd6a-4c44-893d-30de5941b73f
Description of changes
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.