diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2023-10-13 06:01:45 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-10-13 06:01:45 +0000 |
| commit | 49523dec152f68f48ee65b5612d6b6df035f1ecf (patch) | |
| tree | ffa8eb3b1d6b4bb454dea8ef2a04a078d530bcdb /pkgs/stdenv | |
| parent | 183df628daa5a3cd433490fbb3e6bcafc814ef26 (diff) | |
| parent | 8a68e0b5f5b066adcf26558a383580da64e71456 (diff) | |
| download | nixlib-49523dec152f68f48ee65b5612d6b6df035f1ecf.tar nixlib-49523dec152f68f48ee65b5612d6b6df035f1ecf.tar.gz nixlib-49523dec152f68f48ee65b5612d6b6df035f1ecf.tar.bz2 nixlib-49523dec152f68f48ee65b5612d6b6df035f1ecf.tar.lz nixlib-49523dec152f68f48ee65b5612d6b6df035f1ecf.tar.xz nixlib-49523dec152f68f48ee65b5612d6b6df035f1ecf.tar.zst nixlib-49523dec152f68f48ee65b5612d6b6df035f1ecf.zip | |
Merge staging-next into staging
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 000c254cf258..170e569b8244 100644 --- a/pkgs/stdenv/adapters.nix +++ b/pkgs/stdenv/adapters.nix @@ -193,8 +193,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: { |