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

llvmPackages.compiler-rt: fix cross-compilation on Darwin

Browse Source 
When compiler-rt targets Darwin, it is built with `-target`, which
causes clang to try to invoke `ld` without a target prefix (e.g., it
will try to exec `ld` instead of `x86_64-apple-darwin-ld` on a
cross-build to x86_64-darwin). Specifying `--ld-path` overrides that
behavior, allowing it to find the appropriate cross-linker.
This commit is contained in:
Randy Eckenrode
2024-10-10 16:23:02 -04:00
parent e6a4c83d20
commit 3e5acdacdd
1 changed files with 15 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/development/compilers/llvm/common/compiler-rt/default.nix
+15 -10
View File
@@ -84,16 +84,21 @@ stdenv.mkDerivation ({
# This can be removed once the minimum SDK >10.12 on x86_64-darwin.
++ lib.optionals (stdenv.hostPlatform.isDarwin && !stdenv.hostPlatform.isStatic) [ apple-sdk' ];
env.NIX_CFLAGS_COMPILE = toString ([
"-DSCUDO_DEFAULT_OPTIONS=DeleteSizeMismatch=0:DeallocationTypeMismatch=0"
] ++ lib.optionals (!haveLibc) [
# The compiler got stricter about this, and there is a usellvm patch below
# which patches out the assert include causing an implicit definition of
# assert. It would be nicer to understand why compiler-rt thinks it should
# be able to #include <assert.h> in the first place; perhaps it's in the
# wrong, or perhaps there is a way to provide an assert.h.
"-Wno-error=implicit-function-declaration"
]);
env = {
NIX_CFLAGS_COMPILE = toString ([
"-DSCUDO_DEFAULT_OPTIONS=DeleteSizeMismatch=0:DeallocationTypeMismatch=0"
] ++ lib.optionals (!haveLibc) [
# The compiler got stricter about this, and there is a usellvm patch below
# which patches out the assert include causing an implicit definition of
# assert. It would be nicer to understand why compiler-rt thinks it should
# be able to #include <assert.h> in the first place; perhaps it's in the
# wrong, or perhaps there is a way to provide an assert.h.
"-Wno-error=implicit-function-declaration"
]);
} // lib.optionalAttrs (stdenv.hostPlatform.isDarwin) {
# Work around clang’s trying to invoke unprefixed-ld on Darwin when `-target` is passed.
NIX_CFLAGS_LINK = "--ld-path=${stdenv.cc.bintools}/bin/${stdenv.cc.targetPrefix}ld";
};
cmakeFlags = [
"-DCOMPILER_RT_DEFAULT_TARGET_ONLY=ON"