nathan/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2026-10-30 16:10:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

rust: fix 1.98.0 build on darwin

Browse Source 
Since 1.98.0 the darwin tarball links LLVM dynamically and ships an unversioned
libLLVM.dylib (rust-lang/rust#157205).
This shadows our nixpkgs-built libLLVM.dylib when we run our own toolchain,
leading to missing symbols.
Rename the dylib that upstream ships to avoid the shadowing, similar to what
upstream already does for linux.

(cherry picked from commit 5b4742e823)
This commit is contained in:
r-vdp
2026-08-27 09:49:07 +02:00
committed by Adam C. Stephens
parent cd9fbb9e4a
commit a5db992e6c
1 changed files with 16 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
pkgs/development/compilers/rust/binary.nix
View File

@@ -65,6 +65,22 @@ rec {
+ lib.optionalString stdenv.hostPlatform.isDarwin ''
install_name_tool -change "/usr/lib/libcurl.4.dylib" \
"${lib.getLib curl}/lib/libcurl.4.dylib" "$out/bin/cargo"
''
+ lib.optionalString (stdenv.hostPlatform.isDarwin && (lib.versionAtLeast version "1.98")) ''
# Since 1.98.0 the darwin tarball links LLVM dynamically and ships an
# unversioned libLLVM.dylib (rust-lang/rust#157205).
# This shadows our nixpkgs-built libLLVM.dylib when we run our own
# toolchain, leading to missing symbols.
# Rename the dylib that upstream ships to avoid the shadowing, similar
# to what upstream already does for linux.
if [ -e "$out/lib/libLLVM.dylib" ]; then
versioned=libLLVM-rust-bootstrap-${version}.dylib
mv "$out/lib/libLLVM.dylib" "$out/lib/$versioned"
install_name_tool -id "@rpath/$versioned" "$out/lib/$versioned"
find "$out/bin" "$out/lib" -type f \( -perm -0100 -o -name '*.dylib' \) \
-exec install_name_tool -change "@rpath/libLLVM.dylib" \
"@rpath/$versioned" {} \;
fi
'';
# The strip tool in cctools 973.0.1 and up appears to break rlibs in the