rust-overlay: restore SYSROOT detection for Darwin #309
+4
−5
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
ggreif
changed the title
ggreif
added a commit
to dfinity/motoko
that referenced
this pull request
Apr 26, 2023
and a few deps too needs patched toolset from mozilla (PRs submitted: mozilla/nixpkgs-mozilla#309)
1 task
14 tasks
mergify bot
pushed a commit
to dfinity/motoko
that referenced
this pull request
May 24, 2023
and a few deps too: - `wasi-libc` needs patched toolset from mozilla (PRs submitted: mozilla/nixpkgs-mozilla#309) TODO: - [x] `motoko-rts-test` fails in `stream flushing` with unaligned memory access — see #3981
|
Bump for attention. |
Unfortunately, this does not work this way … |
nbp
reviewed
Jun 26, 2023
rust-overlay.nix
Outdated
Comment on lines
301
to
305
| # Here we copy the librustc_driver-*.{so,dylib} to our derivation. | ||
| # The SYSROOT is determined based on the path of this library. | ||
| if ls $out/lib/librustc_driver-*.so &> /dev/null; then | ||
| RUSTC_DRIVER_PATH=$(realpath -e $out/lib/librustc_driver-*.so) | ||
| rm $out/lib/librustc_driver-*.so | ||
| cp $RUSTC_DRIVER_PATH $out/lib/ | ||
| fi | ||
| shopt -s nullglob | ||
| RUSTC_DRIVER_PATH=$(realpath -e $out/lib/librustc_driver-*.{so,dylib}) | ||
| cp --remove-destination $RUSTC_DRIVER_PATH $out/lib/ |
There was a problem hiding this comment.
Shouldn't this file be copied before the loop which is using conditionally checking whether this file exists before using patchelf?
|
Looks like #304 has fixed this, so closing for now. |
|
Unfortunately |
Artturin
suggested changes
Jul 31, 2023
…ed copying this is review feedback, thanks!
|
@AliSajid I am using this branch as |
Artturin
approved these changes
Aug 11, 2023
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.
f6fe850 broke Darwin (fixes #304).
This PR:
rmbeforecp(and uses--remove-destinationinstead)librustc_driver-*.dylibtooTakes some cues from #306 (and supersedes it).