diff options
| author | Alyssa Ross <hi@alyssa.is> | 2021-05-15 21:29:25 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2021-05-31 14:59:14 +0000 |
| commit | 7216862bb027ac70d54005635553bcb17cd48cc4 (patch) | |
| tree | dca238f96df9717232cd958437db0f121409f915 /pkgs/os-specific/bsd | |
| parent | 603f80066eacdbd666e04adf5239934b09be2c34 (diff) | |
| download | nixpkgs-7216862bb027ac70d54005635553bcb17cd48cc4.tar nixpkgs-7216862bb027ac70d54005635553bcb17cd48cc4.tar.gz nixpkgs-7216862bb027ac70d54005635553bcb17cd48cc4.tar.bz2 nixpkgs-7216862bb027ac70d54005635553bcb17cd48cc4.tar.lz nixpkgs-7216862bb027ac70d54005635553bcb17cd48cc4.tar.xz nixpkgs-7216862bb027ac70d54005635553bcb17cd48cc4.tar.zst nixpkgs-7216862bb027ac70d54005635553bcb17cd48cc4.zip | |
netbsdCross.ld_elf_so: use same stage's libc
We need netbsdCross.ld_elf_so to be the dynamic linker in cross netbsd's bintools, but netbsdCross doesn't have a libc in stdenv. So instead, use netbsdCross.libc for netbsdCross.ld_elf_so.
Diffstat (limited to 'pkgs/os-specific/bsd')
| -rw-r--r-- | pkgs/os-specific/bsd/netbsd/default.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/os-specific/bsd/netbsd/default.nix b/pkgs/os-specific/bsd/netbsd/default.nix index 7aad67e777e..9e0b734c817 100644 --- a/pkgs/os-specific/bsd/netbsd/default.nix +++ b/pkgs/os-specific/bsd/netbsd/default.nix @@ -753,11 +753,11 @@ in lib.makeScopeWithSplicing version = "9.1"; sha256 = "0ia9mqzdljly0vqfwflm5mzz55k7qsr4rw2bzhivky6k30vgirqa"; meta.platforms = lib.platforms.netbsd; - LIBC_PIC = "${stdenv.cc.libc}/lib/libc_pic.a"; + LIBC_PIC = "${self.libc}/lib/libc_pic.a"; # Hack to prevent a symlink being installed here for compatibility. SHLINKINSTALLDIR = "/usr/libexec"; USE_FORT = "yes"; - makeFlags = [ "CLIBOBJ=${stdenv.cc.libc}/lib" ]; + makeFlags = [ "BINDIR=$(out)/libexec" "CLIBOBJ=${self.libc}/lib" ]; extraPaths = with self; [ libc.src ] ++ libc.extraPaths; }; |