MirrorHub/nixpkgs
0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-16 14:54:29 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

musl: make libc -> {ldso,ldd} symlinks relative

Browse source 
Minor touchup while rebuilding things anyway.
This commit is contained in:
Will Dietz 2018-03-11 21:00:19 -05:00
parent 2d54f8f915
commit 558f7424f2
1 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
pkgs/os-specific/linux/musl/default.nix
View file

@ -51,6 +51,13 @@ stdenv.mkDerivation rec {
--replace -fno-asynchronous-unwind-tables "" --replace -fno-asynchronous-unwind-tables ""
''; '';
patches = [
# Minor touchup to build system making dynamic linker symlink relative
(fetchurl {
url = https://raw.githubusercontent.com/openwrt/openwrt/87606e25afac6776d1bbc67ed284434ec5a832b4/toolchain/musl/patches/300-relative.patch;
sha256 = "0hfadrycb60sm6hb6by4ycgaqc9sgrhh42k39v8xpmcvdzxrsq2n";
})
];
preConfigure = '' preConfigure = ''
configureFlagsArray+=("--syslibdir=$out/lib") configureFlagsArray+=("--syslibdir=$out/lib")
''; '';
@ -80,7 +87,7 @@ stdenv.mkDerivation rec {
mkdir -p $out/bin mkdir -p $out/bin
# Create 'ldd' symlink, builtin # Create 'ldd' symlink, builtin
ln -s $out/lib/libc.so $out/bin/ldd ln -rs $out/lib/libc.so $out/bin/ldd
# (impure) cc wrapper around musl for interactive usuage # (impure) cc wrapper around musl for interactive usuage
for i in musl-gcc musl-clang ld.musl-clang; do for i in musl-gcc musl-clang ld.musl-clang; do