pyrox.dev / nixpkgs
lol
0
fork

Configure Feed

Select the types of activity you want to include in your feed.

zlib: link with --undefined-version on lld

authored by

Audrey Dutcher and committed by
Alyssa Ross 6234b3e8 8290e233

+10 -3
+10 -3
pkgs/development/libraries/zlib/default.nix
··· 101 101 ln -s zlib1.dll $out/bin/libz.dll 102 102 ''; 103 103 104 - # As zlib takes part in the stdenv building, we don't want references 105 - # to the bootstrap-tools libgcc (as uses to happen on arm/mips) 106 - env.NIX_CFLAGS_COMPILE = lib.optionalString (!stdenv.hostPlatform.isDarwin) "-static-libgcc"; 104 + env = lib.optionalAttrs (!stdenv.hostPlatform.isDarwin) { 105 + # As zlib takes part in the stdenv building, we don't want references 106 + # to the bootstrap-tools libgcc (as uses to happen on arm/mips) 107 + NIX_CFLAGS_COMPILE = "-static-libgcc"; 108 + } // lib.optionalAttrs (stdenv.hostPlatform.linker == "lld") { 109 + # lld 16 enables --no-undefined-version by defualt 110 + # This makes configure think it can't build dynamic libraries 111 + # this may be removed when a version is packaged with https://github.com/madler/zlib/issues/960 fixed 112 + NIX_LDFLAGS = "--undefined-version"; 113 + }; 107 114 108 115 # We don't strip on static cross-compilation because of reports that native 109 116 # stripping corrupted the target library; see commit 12e960f5 for the report.