diff --git a/Makefile.inc1 b/Makefile.inc1 index 3c93159645f..b07b5f9c1a6 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -3052,7 +3052,8 @@ _clang_libs= lib/clang _llvm_binutils= usr.bin/clang/llvm-ar \ usr.bin/clang/llvm-nm \ usr.bin/clang/llvm-objcopy \ - usr.bin/clang/llvm-size + usr.bin/clang/llvm-size \ + usr.bin/clang/toolchain .endif .if ${MK_USB} != "no" _usb_tools= stand/usb/tools diff --git a/packages/toolchain/Makefile b/packages/toolchain/Makefile index 344f0d250b7..b47d931c2c1 100644 --- a/packages/toolchain/Makefile +++ b/packages/toolchain/Makefile @@ -1,7 +1,13 @@ +.include + WORLDPACKAGE= toolchain SUBPACKAGES= dbg dev man COMPAT_PKGS= dev PKG_SETS= devel +.if ${MK_LLVM_BINUTILS} != "no" +PKG_DEPS.toolchain+= llvm +.endif + .include diff --git a/usr.bin/clang/Makefile b/usr.bin/clang/Makefile index ac92b08a54c..d8650882953 100644 --- a/usr.bin/clang/Makefile +++ b/usr.bin/clang/Makefile @@ -22,6 +22,8 @@ SUBDIR+= llvm-readobj SUBDIR+= llvm-size SUBDIR+= llvm-strings SUBDIR+= llvm-symbolizer +SUBDIR+= .WAIT +SUBDIR+= toolchain .endif .if ${MK_CLANG_EXTRAS} != "no" diff --git a/usr.bin/clang/llvm-ar/Makefile b/usr.bin/clang/llvm-ar/Makefile index ee776a7c0d9..10cd46bad4d 100644 --- a/usr.bin/clang/llvm-ar/Makefile +++ b/usr.bin/clang/llvm-ar/Makefile @@ -1,6 +1,5 @@ .include -PACKAGE= toolchain PROG_CXX= llvm-ar MAN= llvm-ar.1 llvm-ranlib.1 @@ -10,10 +9,4 @@ SRCS+= llvm-ar.cpp LINKS+= ${BINDIR}/llvm-ar ${BINDIR}/llvm-ranlib -.if ${MK_LLVM_BINUTILS} != "no" -SYMLINKS+= llvm-ar ${BINDIR}/ar -SYMLINKS+= llvm-ranlib ${BINDIR}/ranlib -MLINKS+= llvm-ar.1 ar.1 llvm-ar.1 ranlib.1 -.endif - .include "../llvm.prog.mk" diff --git a/usr.bin/clang/llvm-cxxfilt/Makefile b/usr.bin/clang/llvm-cxxfilt/Makefile index 26a5d9e8975..7d49ccb0a8d 100644 --- a/usr.bin/clang/llvm-cxxfilt/Makefile +++ b/usr.bin/clang/llvm-cxxfilt/Makefile @@ -22,9 +22,4 @@ DEPENDFILES+= ${TGHDRS:C/$/.d/} DPSRCS+= ${TGHDRS} CLEANFILES+= ${TGHDRS} ${TGHDRS:C/$/.d/} -.if ${MK_LLVM_BINUTILS} != "no" -SYMLINKS= llvm-cxxfilt ${BINDIR}/c++filt -MLINKS= llvm-cxxfilt.1 c++filt.1 -.endif - .include "../llvm.prog.mk" diff --git a/usr.bin/clang/llvm-nm/Makefile b/usr.bin/clang/llvm-nm/Makefile index 333513246cb..68033ce3874 100644 --- a/usr.bin/clang/llvm-nm/Makefile +++ b/usr.bin/clang/llvm-nm/Makefile @@ -1,6 +1,5 @@ .include -PACKAGE= toolchain PROG_CXX= llvm-nm SRCDIR= llvm/tools/llvm-nm @@ -23,9 +22,4 @@ DEPENDFILES+= ${TGHDRS:C/$/.d/} DPSRCS+= ${TGHDRS} CLEANFILES+= ${TGHDRS} ${TGHDRS:C/$/.d/} -.if ${MK_LLVM_BINUTILS} != "no" -SYMLINKS+= llvm-nm ${BINDIR}/nm -MLINKS+= llvm-nm.1 nm.1 -.endif - .include "../llvm.prog.mk" diff --git a/usr.bin/clang/llvm-objcopy/Makefile b/usr.bin/clang/llvm-objcopy/Makefile index 13bbab97899..ee9b13b18f1 100644 --- a/usr.bin/clang/llvm-objcopy/Makefile +++ b/usr.bin/clang/llvm-objcopy/Makefile @@ -26,11 +26,4 @@ CLEANFILES+= ${TGHDRS} ${TGHDRS:C/$/.d/} LINKS= ${BINDIR}/llvm-objcopy ${BINDIR}/llvm-strip -.if ${MK_LLVM_BINUTILS} != "no" -SYMLINKS+= llvm-objcopy ${BINDIR}/objcopy \ - llvm-strip ${BINDIR}/strip -MLINKS= llvm-objcopy.1 objcopy.1 \ - llvm-objcopy.1 strip.1 -.endif - .include "../llvm.prog.mk" diff --git a/usr.bin/clang/llvm-readobj/Makefile b/usr.bin/clang/llvm-readobj/Makefile index 3f705431e50..b669e4398fc 100644 --- a/usr.bin/clang/llvm-readobj/Makefile +++ b/usr.bin/clang/llvm-readobj/Makefile @@ -35,9 +35,4 @@ CLEANFILES+= ${TGHDRS} ${TGHDRS:C/$/.d/} LINKS+= ${BINDIR}/llvm-readobj ${BINDIR}/llvm-readelf -.if ${MK_LLVM_BINUTILS} != "no" -SYMLINKS+= llvm-readelf ${BINDIR}/readelf -MLINKS+= llvm-readelf.1 readelf.1 -.endif - .include "../llvm.prog.mk" diff --git a/usr.bin/clang/llvm-size/Makefile b/usr.bin/clang/llvm-size/Makefile index 1991065b61b..c1b7c770acf 100644 --- a/usr.bin/clang/llvm-size/Makefile +++ b/usr.bin/clang/llvm-size/Makefile @@ -1,6 +1,5 @@ .include -PACKAGE= toolchain PROG_CXX= llvm-size SRCDIR= llvm/tools/llvm-size @@ -23,9 +22,4 @@ DEPENDFILES+= ${TGHDRS:C/$/.d/} DPSRCS+= ${TGHDRS} CLEANFILES+= ${TGHDRS} ${TGHDRS:C/$/.d/} -.if ${MK_LLVM_BINUTILS} != "no" -SYMLINKS+= llvm-size ${BINDIR}/size -MLINKS+= llvm-size.1 size.1 -.endif - .include "../llvm.prog.mk" diff --git a/usr.bin/clang/llvm-symbolizer/Makefile b/usr.bin/clang/llvm-symbolizer/Makefile index 1a3a65c774c..231aeec849c 100644 --- a/usr.bin/clang/llvm-symbolizer/Makefile +++ b/usr.bin/clang/llvm-symbolizer/Makefile @@ -25,9 +25,4 @@ CLEANFILES+= ${TGHDRS} ${TGHDRS:C/$/.d/} LINKS+= ${BINDIR}/llvm-symbolizer ${BINDIR}/llvm-addr2line -.if ${MK_LLVM_BINUTILS} != "no" -SYMLINKS+= llvm-addr2line ${BINDIR}/addr2line -MLINKS+= llvm-addr2line.1 addr2line.1 -.endif - .include "../llvm.prog.mk" diff --git a/usr.bin/clang/toolchain/Makefile b/usr.bin/clang/toolchain/Makefile new file mode 100644 index 00000000000..1a7db32274e --- /dev/null +++ b/usr.bin/clang/toolchain/Makefile @@ -0,0 +1,35 @@ +.include + +.if ${MK_LLVM_BINUTILS} == yes +PACKAGE= toolchain + +SYMLINKS+= llvm-ar ${BINDIR}/ar +SYMLINKS+= llvm-ranlib ${BINDIR}/ranlib +MLINKS+= llvm-ar.1 ar.1 llvm-ar.1 ranlib.1 + +SYMLINKS+= llvm-cov ${BINDIR}/gcov + +SYMLINKS+= llvm-cxxfilt ${BINDIR}/c++filt +MLINKS+= llvm-cxxfilt.1 c++filt.1 + +SYMLINKS+= llvm-nm ${BINDIR}/nm +MLINKS+= llvm-nm.1 nm.1 + +SYMLINKS+= llvm-objcopy ${BINDIR}/objcopy +SYMLINKS+= llvm-strip ${BINDIR}/strip +MLINKS+= llvm-objcopy.1 objcopy.1 +MLINKS+= llvm-objcopy.1 strip.1 + +SYMLINKS+= llvm-objdump ${BINDIR}/objdump + +SYMLINKS+= llvm-readelf ${BINDIR}/readelf +MLINKS+= llvm-readelf.1 readelf.1 + +SYMLINKS+= llvm-size ${BINDIR}/size +MLINKS+= llvm-size.1 size.1 + +SYMLINKS+= llvm-addr2line ${BINDIR}/addr2line +MLINKS+= llvm-addr2line.1 addr2line.1 +.endif + +.include