rust.envVars: use wrapped LLD for aarch64 musl
The unwrapped version doesn't know where to look for libraries, so this is required to e.g. build anything that uses openssl-sys with OPENSSL_NO_VENDOR. A randomly chosen example package that's fixed by this change is pkgsStatic.gitoxide.
This commit is contained in:
@@ -56,4 +56,4 @@ import ./default.nix {
|
||||
rustcPatches = [ ];
|
||||
}
|
||||
|
||||
(builtins.removeAttrs args [ "pkgsBuildTarget" "llvmPackages_17" "llvm_17"])
|
||||
(builtins.removeAttrs args [ "llvmPackages_17" "llvm_17"])
|
||||
|
||||
@@ -16,6 +16,7 @@
|
||||
, CoreFoundation, Security, SystemConfiguration
|
||||
, pkgsBuildBuild
|
||||
, pkgsBuildHost
|
||||
, pkgsBuildTarget
|
||||
, pkgsTargetTarget
|
||||
, makeRustPlatform
|
||||
, wrapRustcWith
|
||||
@@ -23,7 +24,9 @@
|
||||
|
||||
let
|
||||
# Use `import` to make sure no packages sneak in here.
|
||||
lib' = import ../../../build-support/rust/lib { inherit lib stdenv pkgsBuildHost pkgsTargetTarget; };
|
||||
lib' = import ../../../build-support/rust/lib {
|
||||
inherit lib stdenv pkgsBuildHost pkgsBuildTarget pkgsTargetTarget;
|
||||
};
|
||||
# Allow faster cross compiler generation by reusing Build artifacts
|
||||
fastCross = (stdenv.buildPlatform == stdenv.hostPlatform) && (stdenv.hostPlatform != stdenv.targetPlatform);
|
||||
in
|
||||
|
||||
Reference in New Issue
Block a user