{gcov,objdump} twice
ClosedPublic
Actions

Authored by ivy on Mon, May 4, 11:12 AM.

Details

Reviewers

emaste
jrm
dim

Group Reviewers

pkgbase

Commits

rG045a9ef829fa: llvm: Don't install /usr/bin/{gcov,objdump} twice

Summary

Commit c4f08d46c7f7 moved the symlinks for the LLVM binutils from LLVM
itself to the toolchain (usr.bin/clang/toolchain), but did not remove
the links for /usr/bin/gcov and /usr/bin/objdump from the llvm version,
meaning we installed them twice, once in the clang package and once in
the toolchain package.

Remove the links from the llvm version and move the MLINKs to toolchain,
which is where the other MLINKs dwell.

While here, fix toolchain to use the correct build option for llvm-cov,
MK_LLVM_COV.

Fixes: c4f08d46c7f7 ("llvm-*: Move all LLVM_BINUTILS symlinks to toolchain package")
Reported by: jrm
Sponsored by: https://www.patreon.com/bsdivy

Diff Detail

Repository

rG FreeBSD src repository

Lint

Lint Skipped

Unit

Tests Skipped

Build Status

Buildable 72756
Build 69639: arc lint + arc unit

Event Timeline

ivy created this revision.Mon, May 4, 11:12 AM

Herald added a subscriber: imp. · View Herald TranscriptMon, May 4, 11:12 AM

ivy requested review of this revision.Mon, May 4, 11:12 AM

Harbormaster completed remote builds in B72756: Diff 177142.Mon, May 4, 11:12 AM

emaste accepted this revision.Mon, May 4, 1:06 PM

emaste added inline comments.

usr.bin/clang/llvm-cov/Makefile
4	This is implicit if not specified, right?
usr.bin/clang/toolchain/Makefile
34–37	Very minor comment, IMO it would make sense to leave this in alpha order. It probably makes to retire the LLVM_COV option.

This revision is now accepted and ready to land.Mon, May 4, 1:06 PM

This revision now requires review to proceed.Mon, May 4, 1:18 PM

Harbormaster completed remote builds in B72765: Diff 177152.Mon, May 4, 1:18 PM

ivy added inline comments.Mon, May 4, 1:19 PM

usr.bin/clang/llvm-cov/Makefile
4	yes, but i was basing this on `llvm-ar/Makefile` which lists it explicitly... but that's because it installs multiple manpages, so it's not needed here.
usr.bin/clang/toolchain/Makefile
34–37	It probably makes to retire the LLVM_COV option. i was thinking this as well; it's weird to have a specific option for this and nothing else.