diff options
| author | Artturin <Artturin@artturin.com> | 2023-10-13 03:35:26 +0300 |
|---|---|---|
| committer | Artturin <Artturin@artturin.com> | 2023-10-13 05:23:32 +0300 |
| commit | 77bf1395d6c5bb99a33c2bf76b2c6943b31ac85b (patch) | |
| tree | 8852003faf373a35810c913f4511a13ba20bfb14 /pkgs/stdenv/adapters.nix | |
| parent | 30f2ab26fe55137d1c8604880b52951bb6c46804 (diff) | |
| download | nixpkgs-77bf1395d6c5bb99a33c2bf76b2c6943b31ac85b.tar nixpkgs-77bf1395d6c5bb99a33c2bf76b2c6943b31ac85b.tar.gz nixpkgs-77bf1395d6c5bb99a33c2bf76b2c6943b31ac85b.tar.bz2 nixpkgs-77bf1395d6c5bb99a33c2bf76b2c6943b31ac85b.tar.lz nixpkgs-77bf1395d6c5bb99a33c2bf76b2c6943b31ac85b.tar.xz nixpkgs-77bf1395d6c5bb99a33c2bf76b2c6943b31ac85b.tar.zst nixpkgs-77bf1395d6c5bb99a33c2bf76b2c6943b31ac85b.zip | |
mold: add tests for `mold-wrapped` and `useMoldLinker` adapter
Make both ready for cross with prefixes
Currently
`pkgsCross.aarch64-multiplatform.mold.passthru.tests.{wrapped,adapter}`
fail with
```
Testing running the 'hello' binary which should be linked with 'mold'
Hello, world!
Checking for mold in the '.comment' section
No mention of 'mold' detected in the '.comment' section
The command was:
aarch64-unknown-linux-gnu-readelf -p .comment ...bin/hello
The output was:
String dump of section '.comment':
[ 0] GCC: (GNU) 12.3.0
```
Diffstat (limited to 'pkgs/stdenv/adapters.nix')
| -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 f29bdf671c8..9b4ee16a003 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: { |