gador/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

darwin.stdenv: use native Clang as a cross-compiler (#357633)

Browse Source
This commit is contained in:
Emily
2024-11-21 17:33:03 +00:00
committed by GitHub
parent 28b75ea6e8 6596005608
commit 11dd4abb88
1 changed files with 23 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/stdenv/darwin/default.nix
+23 -15
View File
@@ -1274,24 +1274,32 @@ assert bootstrapTools.passthru.isFromBootstrapFiles or false; # sanity check
}
);
}
(lib.optionalAttrs (super.stdenv.targetPlatform == localSystem) (
(bintoolsPackages prevStage)
# These have to be dropped from the overlay when cross-compiling. Wrappers are obviously target-specific.
# darwin.binutils is not yet ready to be target-independent.
(
lib.optionalAttrs (super.stdenv.targetPlatform == localSystem) (bintoolsPackages prevStage)
// {
inherit (prevStage.llvmPackages) clang;
# Need to get rid of these when cross-compiling.
"llvmPackages_${lib.versions.major prevStage.llvmPackages.release_version}" =
let
llvmVersion = lib.versions.major prevStage.llvmPackages.release_version;
tools = super."llvmPackages_${llvmVersion}".tools.extend (
_: _: llvmToolsPackages prevStage // { inherit (prevStage.llvmPackages) clang; }
);
libraries = super."llvmPackages_${llvmVersion}".libraries.extend (
_: _: llvmLibrariesPackages prevStage
);
in
super."llvmPackages_${llvmVersion}" // { inherit tools libraries; } // tools // libraries;
}
))
)
# Since LLVM should be the same regardless of target platform, overlay it to avoid an unnecessary
# rebuild when cross-compiling from Darwin to another platform using clang.
{
"llvmPackages_${lib.versions.major prevStage.llvmPackages.release_version}" =
let
llvmVersion = lib.versions.major prevStage.llvmPackages.release_version;
tools = super."llvmPackages_${llvmVersion}".tools.extend (_: _: llvmToolsPackages prevStage);
libraries = super."llvmPackages_${llvmVersion}".libraries.extend (
_: _:
llvmLibrariesPackages prevStage
// lib.optionalAttrs (super.stdenv.targetPlatform == localSystem) {
inherit (prevStage.llvmPackages) clang;
}
);
in
super."llvmPackages_${llvmVersion}" // { inherit tools libraries; } // tools // libraries;
}
];
};
}