diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2023-10-13 06:01:14 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-10-13 06:01:14 +0000 |
| commit | 8a68e0b5f5b066adcf26558a383580da64e71456 (patch) | |
| tree | 804a0586f75d9680b9c904f098600d89f144b16a /pkgs/stdenv | |
| parent | 58485aaddb4a6531ac7790bf3aefd7a9d22ae1a9 (diff) | |
| parent | 1d6eb597f322f82c84a8ccd8598a60a7322b4f1f (diff) | |
| download | nixlib-8a68e0b5f5b066adcf26558a383580da64e71456.tar nixlib-8a68e0b5f5b066adcf26558a383580da64e71456.tar.gz nixlib-8a68e0b5f5b066adcf26558a383580da64e71456.tar.bz2 nixlib-8a68e0b5f5b066adcf26558a383580da64e71456.tar.lz nixlib-8a68e0b5f5b066adcf26558a383580da64e71456.tar.xz nixlib-8a68e0b5f5b066adcf26558a383580da64e71456.tar.zst nixlib-8a68e0b5f5b066adcf26558a383580da64e71456.zip | |
Merge master into staging-next
Diffstat (limited to 'pkgs/stdenv')
| -rw-r--r-- | pkgs/stdenv/adapters.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/stdenv/adapters.nix b/pkgs/stdenv/adapters.nix index f29bdf671c8c..9b4ee16a003d 100644 --- a/pkgs/stdenv/adapters.nix +++ b/pkgs/stdenv/adapters.nix @@ -192,8 +192,8 @@ rec { useMoldLinker = stdenv: let bintools = stdenv.cc.bintools.override { extraBuildCommands = '' - wrap ld.mold ${../build-support/bintools-wrapper/ld-wrapper.sh} ${pkgs.mold}/bin/ld.mold - wrap ld ${../build-support/bintools-wrapper/ld-wrapper.sh} ${pkgs.mold}/bin/ld.mold + wrap ${stdenv.cc.bintools.targetPrefix}ld.mold ${../build-support/bintools-wrapper/ld-wrapper.sh} ${pkgs.mold}/bin/ld.mold + wrap ${stdenv.cc.bintools.targetPrefix}ld ${../build-support/bintools-wrapper/ld-wrapper.sh} ${pkgs.mold}/bin/ld.mold ''; }; in stdenv.override (old: { |