Skip to content

cctools-llvm: match binutils targetPrefix definition #242316

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

Merged
wegank merged 1 commit into from
Jul 9, 2023
Merged

cctools-llvm: match binutils targetPrefix definition #242316

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
8 changes: 5 additions & 3 deletions pkgs/os-specific/darwin/cctools/llvm.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,11 @@
# Create a cctools-compatible bintools that uses equivalent tools from LLVM in place of the ones
# from cctools when possible.

{ lib, stdenv, makeWrapper, cctools-port, llvmPackages, enableManpages ? true }:
{ lib, stdenv, makeWrapper, cctools-port, llvmPackages, enableManpages ? stdenv.targetPlatform == stdenv.hostPlatform }:

let
inherit (stdenv) targetPlatform hostPlatform;

cctoolsVersion = lib.getVersion cctools-port;
llvmVersion = llvmPackages.release_version;

Expand Down Expand Up @@ -52,7 +54,7 @@ let
++ lib.optional (!useLLVMOtool) "otool"
++ lib.optional (!useLLVMStrip) "strip";

inherit (stdenv.cc) targetPrefix;
targetPrefix = lib.optionalString (targetPlatform != hostPlatform) "${targetPlatform.config}-";

linkManPages = pkg: source: target: lib.optionalString enableManpages ''
sourcePath=${pkg}/share/man/man1/${source}.1.gz
Expand Down Expand Up @@ -81,7 +83,7 @@ stdenv.mkDerivation {
makeWrapper "${lib.getBin llvmPackages.clang-unwrapped}/bin/clang" "$out/bin/${targetPrefix}as" \
--add-flags "-x assembler -integrated-as -c"

ln -s "${lib.getBin llvmPackages.bintools-unwrapped}/bin/llvm-ar" "$out/bin/${targetPrefix}ar"
ln -s "${lib.getBin llvmPackages.bintools-unwrapped}/bin/${targetPrefix}llvm-ar" "$out/bin/${targetPrefix}ar"
${linkManPages llvmPackages.llvm-manpages "llvm-ar" "ar"}

for tool in ${toString llvm_bins}; do
Expand Down