Merge pull request #242749 from reckenrode/rustc-darwin-cleanup
rustc: remove Darwin special-casing
This commit is contained in:
commit
9a705f9834
|
@ -15,7 +15,6 @@
|
||||||
, CoreFoundation, Security, SystemConfiguration
|
, CoreFoundation, Security, SystemConfiguration
|
||||||
, pkgsBuildTarget, pkgsBuildBuild, pkgsBuildHost
|
, pkgsBuildTarget, pkgsBuildBuild, pkgsBuildHost
|
||||||
, makeRustPlatform
|
, makeRustPlatform
|
||||||
, llvmPackages_11
|
|
||||||
, llvmPackages_16, llvm_16
|
, llvmPackages_16, llvm_16
|
||||||
} @ args:
|
} @ args:
|
||||||
|
|
||||||
|
@ -27,8 +26,6 @@ import ./default.nix {
|
||||||
llvmSharedForHost = pkgsBuildHost.llvmPackages_16.libllvm.override { enableSharedLibraries = true; };
|
llvmSharedForHost = pkgsBuildHost.llvmPackages_16.libllvm.override { enableSharedLibraries = true; };
|
||||||
llvmSharedForTarget = pkgsBuildTarget.llvmPackages_16.libllvm.override { enableSharedLibraries = true; };
|
llvmSharedForTarget = pkgsBuildTarget.llvmPackages_16.libllvm.override { enableSharedLibraries = true; };
|
||||||
|
|
||||||
llvmBootstrapForDarwin = llvmPackages_11;
|
|
||||||
|
|
||||||
# For use at runtime
|
# For use at runtime
|
||||||
llvmShared = llvm_16.override { enableSharedLibraries = true; };
|
llvmShared = llvm_16.override { enableSharedLibraries = true; };
|
||||||
|
|
||||||
|
@ -60,4 +57,4 @@ import ./default.nix {
|
||||||
rustcPatches = [ ];
|
rustcPatches = [ ];
|
||||||
}
|
}
|
||||||
|
|
||||||
(builtins.removeAttrs args [ "pkgsBuildHost" "llvmPackages_11" "llvmPackages_16" "llvm_16"])
|
(builtins.removeAttrs args [ "pkgsBuildTarget" "pkgsBuildBuild" "pkgsBuildHost" "llvmPackages_16" "llvm_16"])
|
||||||
|
|
|
@ -5,7 +5,6 @@
|
||||||
, bootstrapHashes
|
, bootstrapHashes
|
||||||
, selectRustPackage
|
, selectRustPackage
|
||||||
, rustcPatches ? []
|
, rustcPatches ? []
|
||||||
, llvmBootstrapForDarwin
|
|
||||||
, llvmShared
|
, llvmShared
|
||||||
, llvmSharedForBuild
|
, llvmSharedForBuild
|
||||||
, llvmSharedForHost
|
, llvmSharedForHost
|
||||||
|
@ -16,7 +15,6 @@
|
||||||
, buildPackages
|
, buildPackages
|
||||||
, newScope, callPackage
|
, newScope, callPackage
|
||||||
, CoreFoundation, Security, SystemConfiguration
|
, CoreFoundation, Security, SystemConfiguration
|
||||||
, pkgsBuildTarget, pkgsBuildBuild
|
|
||||||
, makeRustPlatform
|
, makeRustPlatform
|
||||||
}:
|
}:
|
||||||
|
|
||||||
|
@ -69,11 +67,6 @@ in
|
||||||
|
|
||||||
# Use boot package set to break cycle
|
# Use boot package set to break cycle
|
||||||
inherit (bootstrapRustPackages) cargo rustc;
|
inherit (bootstrapRustPackages) cargo rustc;
|
||||||
} // lib.optionalAttrs (stdenv.cc.isClang && stdenv.hostPlatform == stdenv.buildPlatform) {
|
|
||||||
stdenv = llvmBootstrapForDarwin.stdenv;
|
|
||||||
pkgsBuildBuild = pkgsBuildBuild // { targetPackages.stdenv = llvmBootstrapForDarwin.stdenv; };
|
|
||||||
pkgsBuildHost = pkgsBuildBuild // { targetPackages.stdenv = llvmBootstrapForDarwin.stdenv; };
|
|
||||||
pkgsBuildTarget = pkgsBuildTarget // { targetPackages.stdenv = llvmBootstrapForDarwin.stdenv; };
|
|
||||||
});
|
});
|
||||||
rustfmt = self.callPackage ./rustfmt.nix {
|
rustfmt = self.callPackage ./rustfmt.nix {
|
||||||
inherit Security;
|
inherit Security;
|
||||||
|
|
Loading…
Reference in a new issue