diff options
| author | Vladimír Čunát <v@cunat.cz> | 2021-01-26 08:09:59 +0100 |
|---|---|---|
| committer | Vladimír Čunát <v@cunat.cz> | 2021-01-26 08:09:59 +0100 |
| commit | a648a07c19aebd87b68b9c33449fb06291696b86 (patch) | |
| tree | 86a63c9df3568f59ef6686888a2fb5e0a7ec05d5 /pkgs/stdenv/linux/make-bootstrap-tools.nix | |
| parent | 38e23aeda3f799b9f110f20d795167d54d56a03d (diff) | |
| parent | 9682c1d0da2c64042c274a590aed52f0ac7c571d (diff) | |
Merge #104742: linux bootstrap tools: fix tests on ppc64
Diffstat (limited to 'pkgs/stdenv/linux/make-bootstrap-tools.nix')
| -rw-r--r-- | pkgs/stdenv/linux/make-bootstrap-tools.nix | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pkgs/stdenv/linux/make-bootstrap-tools.nix b/pkgs/stdenv/linux/make-bootstrap-tools.nix index 25cde589a923..e4db92b7717c 100644 --- a/pkgs/stdenv/linux/make-bootstrap-tools.nix +++ b/pkgs/stdenv/linux/make-bootstrap-tools.nix @@ -258,7 +258,7 @@ in with pkgs; rec { gcc --version '' + lib.optionalString (stdenv.hostPlatform.libc == "glibc") '' - ldlinux=$(echo ${bootstrapTools}/lib/ld-linux*.so.?) + ldlinux=$(echo ${bootstrapTools}/lib/${builtins.baseNameOf binutils.dynamicLinker}) export CPP="cpp -idirafter ${bootstrapTools}/include-glibc -B${bootstrapTools}" export CC="gcc -idirafter ${bootstrapTools}/include-glibc -B${bootstrapTools} -Wl,-dynamic-linker,$ldlinux -Wl,-rpath,${bootstrapTools}/lib" export CXX="g++ -idirafter ${bootstrapTools}/include-glibc -B${bootstrapTools} -Wl,-dynamic-linker,$ldlinux -Wl,-rpath,${bootstrapTools}/lib" |