fix pkgsMusl.cargo via cargoSetupHook #198311

yu-re-ka · 2022-10-28T17:06:09Z

Description of changes

This is a variant of #190796, which removes the need for patching rustc by always applying the unstable host-config flag in cargoSetupHook.

Things done

alyssais · 2022-10-28T17:56:03Z

pkgs/build-support/rust/hooks/default.nix

@@ -70,13 +70,17 @@ in {

        # Target platform
        rustTarget = ''
-          [target."${rust.toRustTarget stdenv.buildPlatform}"]
+          [host."${rust.toRustTarget stdenv.buildPlatform}"]


Do we need to specify the triple here, or can we just do [host]?

I think both work, do you prefer just [host]?

I'd have a mild preference for the former, just because it means we don't have to worry about what happens if e.g. using a custom build spec. But I don't think it's too important, and would understand if you wanted it to be consistent with what we were already doing for target.

alyssais · 2022-10-28T18:08:32Z

pkgs/build-support/rust/hooks/default.nix

@@ -70,13 +70,17 @@ in {

        # Target platform
        rustTarget = ''


Might make sense to rename this, and probably expand the comment a bit to explain what's going on? You could probably just adapt what I wrote in the other PR if you want.

done, please let me know if the comment is ok

symphorien · 2022-10-28T23:22:54Z

are -Z flags allowed without RUSTC_BOOTSTRAP=1 ?

yu-re-ka · 2022-10-29T04:00:48Z

are -Z flags allowed without RUSTC_BOOTSTRAP=1 ?

The way we set it, in .cargo/config, it works. I tested that fd builds, which does not have RUSTC_BOOTSTRAP=1.

symphorien · 2022-10-30T08:58:03Z

pkgs/build-support/rust/hooks/default.nix

+
+          [unstable]
+          host-config = true
+          target-applies-to-host = true


I'm very puzzled as to why you set target-applies-to-host to true: the doc says

It requires the -Zhost-config and -Ztarget-applies-to-host command-line options to be set, and that target-applies-to-host = false is set in the Cargo configuration file.

https://doc.rust-lang.org/nightly/cargo/reference/unstable.html#host-config

There is two things here:

Is the target-applies-to-host unstable feature enabled?

If yes, this unlocks a new target-applies-to-host option

Also see, in the same section:

Setting -Zhost-config changes the default for target-applies-to-host to false from true.

ok I understand. Then the change looks sensible to me, and if things build with it then go for it.

alyssais

I like this better than my approach, and in my testing, all the builds my version fixed are also fixed by this change.

It's still an open question what to do for rustc on Musl when used outside of Cargo, but that's orthogonal to this change. For Cargo this is the way to go.

pkgs/build-support/rust/hooks/default.nix

lf- · 2022-11-24T23:40:54Z

This PR seems to have regressed packages being able to set target.*.rustflags inside a .cargo/config file. I'm investigating sapling being broken on darwin (see #201798), and that setting is not getting through to the compiler. Since the setup hook sets host.rustflags, it seems that any .cargo/config file inside projects will have its target.aarch64-apple-darwin.rustflags setting ignored. This is the resulting config:

[nix-shell:/tmp/sapling/source/eden/scm]$ RUSTC_BOOTSTRAP=1 cargo config -Z unstable-options get --show-origin
-snip-
source.vendored-sources.directory = "cargo-vendor-dir" # /private/tmp/sapling/.cargo/config
target.aarch64-apple-darwin.linker = "/nix/store/v069wkyb6y6qw2bhpzag5kka19j7clgg-clang-wrapper-11.1.0/
bin/cc" # /private/tmp/sapling/.cargo/config
target.aarch64-apple-darwin.rustflags = [
    "-C", # /private/tmp/sapling/source/eden/scm/.cargo/config
    "link-args=-Wl,-undefined,dynamic_lookup", # /private/tmp/sapling/source/eden/scm/.cargo/config
    "-C", # /private/tmp/sapling/.cargo/config
    "target-feature=-crt-static", # /private/tmp/sapling/.cargo/config
]
target.arm64-apple-darwin.rustflags = [
    "-C", # /private/tmp/sapling/source/eden/scm/.cargo/config
    "link-args=-Wl,-undefined,dynamic_lookup", # /private/tmp/sapling/source/eden/scm/.cargo/config
]
target.i686-apple-darwin.rustflags = [
    "-C", # /private/tmp/sapling/source/eden/scm/.cargo/config
    "link-args=-Wl,-undefined,dynamic_lookup", # /private/tmp/sapling/source/eden/scm/.cargo/config
]
target.x86_64-apple-darwin.rustflags = [
    "-C", # /private/tmp/sapling/source/eden/scm/.cargo/config
    "link-args=-Wl,-undefined,dynamic_lookup", # /private/tmp/sapling/source/eden/scm/.cargo/config
]
unstable.host-config = true # /private/tmp/sapling/.cargo/config
unstable.target-applies-to-host = true # /private/tmp/sapling/.cargo/config

lf- · 2022-11-24T23:47:57Z

Ah, it's actually specifically the unstable.* options that cause this. Nevertheless, this causes some breakage of project cargo config files.

yu-re-ka requested review from Mic92, LnL7 and zowoq as code owners October 28, 2022 17:06

github-actions bot added the 6.topic: rust label Oct 28, 2022

ofborg bot requested a review from retrry October 28, 2022 17:21

ofborg bot added 10.rebuild-darwin: 501+ 10.rebuild-darwin: 5001+ 10.rebuild-linux: 501+ 10.rebuild-linux: 5001+ labels Oct 28, 2022

yu-re-ka changed the base branch from master to staging October 28, 2022 17:47

alyssais reviewed Oct 28, 2022

View reviewed changes

yu-re-ka added 2 commits October 28, 2022 20:37

cargoSetupHook: pass host config flags

bd5a9a3

cargo: no longer broken on musl

e76e5a5

yu-re-ka mentioned this pull request Oct 29, 2022

cargo-c: fix cross and static #198410

Closed

13 tasks

yu-re-ka requested a review from alyssais October 30, 2022 08:21

symphorien reviewed Oct 30, 2022

View reviewed changes

alyssais approved these changes Oct 30, 2022

View reviewed changes

yu-re-ka merged commit 7852c61 into NixOS:staging Oct 30, 2022

alyssais mentioned this pull request Oct 30, 2022

pkgsMusl.cargo: fix build #190796

Closed

13 tasks

yu-re-ka deleted the musl-cargo branch October 31, 2022 02:01

yu-re-ka mentioned this pull request Oct 31, 2022

pkgsMusl.firefox: fix build #198773

Merged

13 tasks

lf- reviewed Nov 24, 2022

View reviewed changes

pkgs/build-support/rust/hooks/default.nix Show resolved Hide resolved

alyssais mentioned this pull request Mar 16, 2023

rust: fix overriding rust flags on musl #221413

Merged

12 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

fix pkgsMusl.cargo via cargoSetupHook #198311

fix pkgsMusl.cargo via cargoSetupHook #198311

yu-re-ka commented Oct 28, 2022 •

edited

Loading

alyssais Oct 28, 2022

yu-re-ka Oct 28, 2022 •

edited

Loading

alyssais Oct 28, 2022

yu-re-ka Oct 28, 2022

alyssais Oct 28, 2022

yu-re-ka Oct 28, 2022

symphorien commented Oct 28, 2022

yu-re-ka commented Oct 29, 2022

symphorien Oct 30, 2022

yu-re-ka Oct 30, 2022

symphorien Oct 30, 2022

alyssais left a comment •

edited

Loading

lf- commented Nov 24, 2022

lf- commented Nov 24, 2022

fix pkgsMusl.cargo via cargoSetupHook #198311

fix pkgsMusl.cargo via cargoSetupHook #198311

Conversation

yu-re-ka commented Oct 28, 2022 • edited Loading

Description of changes

Things done

Choose a reason for hiding this comment

yu-re-ka Oct 28, 2022 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

symphorien commented Oct 28, 2022

yu-re-ka commented Oct 29, 2022

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

alyssais left a comment • edited Loading

Choose a reason for hiding this comment

lf- commented Nov 24, 2022

lf- commented Nov 24, 2022

yu-re-ka commented Oct 28, 2022 •

edited

Loading

yu-re-ka Oct 28, 2022 •

edited

Loading

alyssais left a comment •

edited

Loading