diff options
| author | sternenseemann <sternenseemann@systemli.org> | 2023-01-16 19:29:40 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-01-16 19:29:40 +0100 |
| commit | 8e35002bc2be4e76d6056d35b3932b4fd9bcdc77 (patch) | |
| tree | d4ca1eec2abce6e16a739139d446785fd3b73aa2 /pkgs/stdenv/linux/make-bootstrap-tools.nix | |
| parent | 20dcc6920f596846aac9787c46a31868f6ecab46 (diff) | |
| download | nixpkgs-8e35002bc2be4e76d6056d35b3932b4fd9bcdc77.tar nixpkgs-8e35002bc2be4e76d6056d35b3932b4fd9bcdc77.tar.gz nixpkgs-8e35002bc2be4e76d6056d35b3932b4fd9bcdc77.tar.bz2 nixpkgs-8e35002bc2be4e76d6056d35b3932b4fd9bcdc77.tar.lz nixpkgs-8e35002bc2be4e76d6056d35b3932b4fd9bcdc77.tar.xz nixpkgs-8e35002bc2be4e76d6056d35b3932b4fd9bcdc77.tar.zst nixpkgs-8e35002bc2be4e76d6056d35b3932b4fd9bcdc77.zip | |
make-bootstrap-tools.nix: don't pull in pkgs.glibc in test (#210038)
`builtins.baseNameOf` retains any string context, causing the test derivation to incorrectly depend on `pkgs.glibc`. All we really want is to know what the dynamicLinker is called, but we don't need it to be present in store. Thanks to Adam Joseph for spotting this.
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 c6112766781..e98ba0c0859 100644 --- a/pkgs/stdenv/linux/make-bootstrap-tools.nix +++ b/pkgs/stdenv/linux/make-bootstrap-tools.nix @@ -272,7 +272,7 @@ in with pkgs; rec { gcc --version '' + lib.optionalString (stdenv.hostPlatform.libc == "glibc") '' - ldlinux=$(echo ${bootstrapTools}/lib/${builtins.baseNameOf binutils.dynamicLinker}) + ldlinux=$(echo ${bootstrapTools}/lib/${builtins.unsafeDiscardStringContext /* only basename */ (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" |