diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2023-10-12 00:02:50 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-10-12 00:02:50 +0000 |
| commit | 7909827752645f46c9ebc0d71e3b5934d0a074a0 (patch) | |
| tree | 9c7305213709e06b6f44439578e657bb2ad26d33 /pkgs/build-support/rust | |
| parent | 9efdb6370671eabb4c8778eac11cd00721dd4b89 (diff) | |
| parent | b51626e173687365d695e1d2c6769a66753bc00e (diff) | |
| download | nixpkgs-7909827752645f46c9ebc0d71e3b5934d0a074a0.tar nixpkgs-7909827752645f46c9ebc0d71e3b5934d0a074a0.tar.gz nixpkgs-7909827752645f46c9ebc0d71e3b5934d0a074a0.tar.bz2 nixpkgs-7909827752645f46c9ebc0d71e3b5934d0a074a0.tar.lz nixpkgs-7909827752645f46c9ebc0d71e3b5934d0a074a0.tar.xz nixpkgs-7909827752645f46c9ebc0d71e3b5934d0a074a0.tar.zst nixpkgs-7909827752645f46c9ebc0d71e3b5934d0a074a0.zip | |
Merge staging-next into staging
Diffstat (limited to 'pkgs/build-support/rust')
| -rw-r--r-- | pkgs/build-support/rust/hooks/default.nix | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/build-support/rust/hooks/default.nix b/pkgs/build-support/rust/hooks/default.nix index c73ec30082d..205d085d350 100644 --- a/pkgs/build-support/rust/hooks/default.nix +++ b/pkgs/build-support/rust/hooks/default.nix @@ -67,9 +67,9 @@ cargoConfig = '' [target."${rust.toRustTarget stdenv.buildPlatform}"] "linker" = "${rust.envVars.ccForBuild}" - ${lib.optionalString (stdenv.hostPlatform.config != stdenv.targetPlatform.config) '' - [target."${rust.toRustTarget stdenv.targetPlatform}"] - "linker" = "${rust.envVars.ccForTarget}" + ${lib.optionalString (stdenv.buildPlatform.config != stdenv.hostPlatform.config) '' + [target."${rust.toRustTarget stdenv.hostPlatform}"] + "linker" = "${rust.envVars.ccForHost}" ''} "rustflags" = [ "-C", "target-feature=${if stdenv.hostPlatform.isStatic then "+" else "-"}crt-static" ] ''; |