Page MenuHomeFreeBSD
Files F157564733

D55692.id176115.diff
No OneTemporary
Actions

D55692.id176115.diff
View Options

Index: Makefile.inc1
===================================================================
--- Makefile.inc1
+++ Makefile.inc1
@@ -3077,7 +3077,8 @@
_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
Index: usr.bin/clang/Makefile
===================================================================
--- usr.bin/clang/Makefile
+++ usr.bin/clang/Makefile
@@ -22,6 +22,7 @@
SUBDIR+= llvm-size
SUBDIR+= llvm-strings
SUBDIR+= llvm-symbolizer
+SUBDIR+= toolchain
.endif
.if ${MK_CLANG_EXTRAS} != "no"
Index: usr.bin/clang/llvm-ar/Makefile
===================================================================
--- usr.bin/clang/llvm-ar/Makefile
+++ usr.bin/clang/llvm-ar/Makefile
@@ -1,6 +1,5 @@
.include <src.opts.mk>
-PACKAGE= toolchain
PROG_CXX= llvm-ar
MAN= llvm-ar.1 llvm-ranlib.1
@@ -10,10 +9,4 @@
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"
Index: usr.bin/clang/llvm-cxxfilt/Makefile
===================================================================
--- usr.bin/clang/llvm-cxxfilt/Makefile
+++ usr.bin/clang/llvm-cxxfilt/Makefile
@@ -22,9 +22,4 @@
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"
Index: usr.bin/clang/llvm-nm/Makefile
===================================================================
--- usr.bin/clang/llvm-nm/Makefile
+++ usr.bin/clang/llvm-nm/Makefile
@@ -1,6 +1,5 @@
.include <src.opts.mk>
-PACKAGE= toolchain
PROG_CXX= llvm-nm
SRCDIR= llvm/tools/llvm-nm
@@ -23,9 +22,4 @@
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"
Index: usr.bin/clang/llvm-objcopy/Makefile
===================================================================
--- usr.bin/clang/llvm-objcopy/Makefile
+++ usr.bin/clang/llvm-objcopy/Makefile
@@ -26,11 +26,4 @@
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"
Index: usr.bin/clang/llvm-readobj/Makefile
===================================================================
--- usr.bin/clang/llvm-readobj/Makefile
+++ usr.bin/clang/llvm-readobj/Makefile
@@ -35,9 +35,4 @@
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"
Index: usr.bin/clang/llvm-size/Makefile
===================================================================
--- usr.bin/clang/llvm-size/Makefile
+++ usr.bin/clang/llvm-size/Makefile
@@ -1,6 +1,5 @@
.include <src.opts.mk>
-PACKAGE= toolchain
PROG_CXX= llvm-size
SRCDIR= llvm/tools/llvm-size
@@ -23,9 +22,4 @@
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"
Index: usr.bin/clang/llvm-symbolizer/Makefile
===================================================================
--- usr.bin/clang/llvm-symbolizer/Makefile
+++ usr.bin/clang/llvm-symbolizer/Makefile
@@ -25,9 +25,4 @@
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"
Index: usr.bin/clang/toolchain/Makefile
===================================================================
--- /dev/null
+++ usr.bin/clang/toolchain/Makefile
@@ -0,0 +1,35 @@
+.include <src.opts.mk>
+
+.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 <bsd.prog.mk>

File Metadata

Mime Type
text/plain
Expires
Sat, May 23, 9:36 PM (11 h, 43 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
33454934
Default Alt Text
D55692.id176115.diff (4 KB)

Event Timeline