Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

toolchains/cc: Fix process getting killed on aarch64-darwin during li… #479

Merged
merged 1 commit into from
Feb 2, 2024
Merged

toolchains/cc: Fix process getting killed on aarch64-darwin during li… #479

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 11 additions & 1 deletion toolchains/cc/cc.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,13 +60,23 @@ let
name = "bazel-${cc.name}-wrapper";
# XXX: `gcov` is missing in `/bin`.
# It exists in `stdenv.cc.cc` but that collides with `stdenv.cc`.
paths = [ cc cc.bintools ] ++ pkgs.lib.optional pkgs.stdenv.isDarwin pkgs.darwin.cctools;
paths = [ cc cc.bintools ];
pathsToLink = [ "/bin" ];
passthru = {
inherit (cc) isClang targetPrefix;
orignalName = cc.name;
};
} // (pkgs.lib.optionalAttrs pkgs.stdenv.isDarwin {
# only add tools from darwin.cctools, but don't overwrite existing tools
postBuild = ''
for tool in libtool objdump; do
if [[ ! -e $out/bin/$tool ]]; then
ln -s -t $out/bin ${pkgs.darwin.cctools}/bin/$tool
fi
done
'';
}
)
)
;
in
Expand Down