buildRustCrate: Set target_os to "macos" on darwin #33137
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
marsam
force-pushed
the
feature/fix-build-rust-create-darwin
branch
from
34ec24d
to
6f40d72
Compare
|
Could you provide a small example to test this? |
marsam
force-pushed
the
feature/fix-build-rust-create-darwin
branch
2 times, most recently
from
bc52b78
to
405acb7
Compare
The rust compiler uses "macos" as "target_os" conditional on Mac OS[1] [1] https://github.com/rust-lang/rust/blob/8e7a609e635b728eba65d471c985ab462dc4cfc7/src/librustc_back/target/x86_64_apple_darwin.rs#L29
marsam
force-pushed
the
feature/fix-build-rust-create-darwin
branch
from
405acb7
to
bdf031d
Compare
|
Hi, sorry for the late response
Sure! but I'm not sure what you might consider a test. |
|
Ack, sorry this was missed. Just hit this myself, I'll verify this fixes my issue (building |
shlevy
reviewed
Jul 2, 2018
| @@ -98,7 +98,7 @@ let makeDeps = dependencies: | |||
| export CARGO_PKG_AUTHORS="${authors}" | |||
|
|
|||
| export CARGO_CFG_TARGET_ARCH=${buildPlatform.parsed.cpu.name} | |||
| export CARGO_CFG_TARGET_OS=${buildPlatform.parsed.kernel.name} | |||
| export CARGO_CFG_TARGET_OS=${if buildPlatform.isDarwin then "macos" else buildPlatform.parsed.kernel.name} | |||
There was a problem hiding this comment.
@marsam Can you add a comment with a link to https://github.com/rust-lang-nursery/rust-forge/issues/101 which suggests that the target_os values are as-yet undocumented?
|
@GrahamcOfBorg eval |
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.
The rust compiler uses "macos" as "target_os" conditional on Mac OS[1]
[1] https://github.com/rust-lang/rust/blob/8e7a609e635b728eba65d471c985ab462dc4cfc7/src/librustc_back/target/x86_64_apple_darwin.rs#L29
Motivation for this change
Things done
build-use-sandboxinnix.confon non-NixOS)nix-shell -p nox --run "nox-review wip"./result/bin/)