Index: tools/build/mk/OptionalObsoleteFiles.inc =================================================================== --- tools/build/mk/OptionalObsoleteFiles.inc +++ tools/build/mk/OptionalObsoleteFiles.inc @@ -1182,6 +1182,7 @@ OLD_FILES+=usr/bin/llvm-size OLD_FILES+=usr/bin/llvm-strings OLD_FILES+=usr/bin/llvm-symbolizer +OLD_FILES+=usr/bin/objdump OLD_FILES+=usr/share/man/man1/llvm-addr2line.1.gz OLD_FILES+=usr/share/man/man1/llvm-ar.1.gz OLD_FILES+=usr/share/man/man1/llvm-nm.1.gz @@ -1192,6 +1193,7 @@ OLD_FILES+=usr/share/man/man1/llvm-size.1.gz OLD_FILES+=usr/share/man/man1/llvm-strings.1.gz OLD_FILES+=usr/share/man/man1/llvm-symbolizer.1.gz +OLD_FILES+=usr/share/man/man1/objdump.1.gz .endif .if ${MK_CLANG} == no @@ -2111,11 +2113,6 @@ OLD_FILES+=usr/share/man/man8/unstr.8.gz .endif -.if ${MK_LLVM_BINUTILS} == no -OLD_FILES+=usr/bin/objdump -OLD_FILES+=usr/share/man/man1/objdump.1.gz -.endif - .if ${MK_LLVM_COV} == no && !defined(WITH_PORT_BASE_GCC) OLD_FILES+=usr/bin/gcov OLD_FILES+=usr/share/man/man1/gcov.1.gz Index: usr.bin/clang/llvm-objdump/Makefile =================================================================== --- usr.bin/clang/llvm-objdump/Makefile +++ usr.bin/clang/llvm-objdump/Makefile @@ -32,9 +32,7 @@ LIBADD+= z -.if ${MK_LLVM_BINUTILS} != "no" LINKS= ${BINDIR}/llvm-objdump ${BINDIR}/objdump MLINKS= llvm-objdump.1 objdump.1 -.endif .include "../llvm.prog.mk"