rustc: patch the path to llvm-strip instead of using /usr/bin/strip on darwin
#362388
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
GaetanLepage
changed the title
/usr/bin/strip on darwin
nix-owners
bot
requested review from
alyssais,
figsoda,
Mic92,
winterqt and
zowoq
alyssais
requested changes
Dec 6, 2024
| substituteInPlace compiler/rustc_codegen_ssa/src/back/link.rs \ | ||
| --replace-fail \ | ||
| 'let stripcmd = if cfg!(target_os = "macos") { "/usr/bin/strip" } else { "strip" };' \ | ||
| 'let stripcmd = "${lib.getExe' llvmPackages.llvm "llvm-strip"}";' |
There was a problem hiding this comment.
Shouldn't this be llvmShared, so we don't end up referencing multiple LLVMs?
(Would appreciate input from somebody who understands all the LLVMs involved here better than me.)
There was a problem hiding this comment.
could we punt on understanding the LLVMs and just use ${lib.getExe' stdenv.cc "strip"} ?
There was a problem hiding this comment.
could we punt on understanding the LLVMs and just use
${lib.getExe' stdenv.cc "strip"}?
eh, maybe that is even worse due to the symlinks. disregard.
GaetanLepage
force-pushed
the
rustc-strip
branch
from
4f6016c to
e2a54e9
Compare
GaetanLepage
force-pushed
the
rustc-strip
branch
from
e2a54e9 to
464187c
Compare
paparodeo
approved these changes
Dec 6, 2024
There was a problem hiding this comment.
LGTM. on staging-next built rustc & cargo outside sandbox on aarch64-darwin and then built ruff in sandbox = relaxed; and built fine.
$ nix-store --query -R /nix/store/swy0zgm75f6385njibppbplsxqb8x9f6-rustc-1.83.0
/nix/store/1w5wdysl1sqnwxaa6j4j4llss93jfn5z-libiconv-107
/nix/store/1k3h865wpr3fzi1mp0j8lndnmmcdr4wr-libxml2-2.13.4
/nix/store/icai2b2bh2rrlhlhnasansdr0p1p7am6-zlib-1.3.1
/nix/store/s17z21xw3p164z0nlgd4v7h4jlr30sjq-libffi-3.4.6
/nix/store/x6xs2b06am37bx45xr59qi14bbws8s34-libcxx-19.1.4
/nix/store/7b9pbhkcqsww1miks3zql7qnqid38qa7-llvm-19.1.4-lib
/nix/store/ggbsv8vxj759k624wi6xvw1yfhi8j59k-bash-5.2p37
/nix/store/px76sq9i5mx39g17bsaj379yhqhdz9w7-llvm-19.1.4
/nix/store/swy0zgm75f6385njibppbplsxqb8x9f6-rustc-1.83.0
|
I'll optimistically merge already. |
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.
Things done
Rust calls hardcoded
/usr/bin/stripon darwin.This leads to build failures in the sandbox.
Instead, hardcode the path to our own
llvm-stripbinary.cc @alyssais @reckenrode @Havvy
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.