From dbc595b2aef4a0b0f115d7297ee1234f6ade8d21 Mon Sep 17 00:00:00 2001 From: Dimitry Andric Date: Wed, 6 Jan 2016 21:28:39 +0000 Subject: [PATCH] Some additional llvm tools need libz. While here, consistently use LIBADD+=. --- usr.bin/clang/bugpoint/Makefile | 2 ++ usr.bin/clang/llc/Makefile | 2 +- usr.bin/clang/lldb/Makefile | 2 +- usr.bin/clang/lli/Makefile | 2 +- usr.bin/clang/llvm-ar/Makefile | 2 +- usr.bin/clang/llvm-cov/Makefile | 2 ++ usr.bin/clang/llvm-cxxdump/Makefile | 2 +- usr.bin/clang/llvm-dwarfdump/Makefile | 2 +- usr.bin/clang/llvm-lto/Makefile | 2 +- usr.bin/clang/llvm-mc/Makefile | 2 +- usr.bin/clang/llvm-nm/Makefile | 2 +- usr.bin/clang/llvm-objdump/Makefile | 2 +- usr.bin/clang/llvm-pdbdump/Makefile | 2 +- usr.bin/clang/llvm-profdata/Makefile | 2 ++ usr.bin/clang/llvm-rtdyld/Makefile | 2 +- usr.bin/clang/llvm-symbolizer/Makefile | 2 +- usr.bin/clang/opt/Makefile | 2 +- 17 files changed, 20 insertions(+), 14 deletions(-) diff --git a/usr.bin/clang/bugpoint/Makefile b/usr.bin/clang/bugpoint/Makefile index 5dd0ede1c444..6c675da77427 100644 --- a/usr.bin/clang/bugpoint/Makefile +++ b/usr.bin/clang/bugpoint/Makefile @@ -40,4 +40,6 @@ LIBDEPS=llvmcodegen \ llvmcore \ llvmsupport +LIBADD+= z + .include "../clang.prog.mk" diff --git a/usr.bin/clang/llc/Makefile b/usr.bin/clang/llc/Makefile index e6c0d5a75b2c..a9d16db787bb 100644 --- a/usr.bin/clang/llc/Makefile +++ b/usr.bin/clang/llc/Makefile @@ -70,6 +70,6 @@ LIBDEPS=llvmmirparser \ llvmcore \ llvmsupport -LIBADD+= z +LIBADD+= z .include "../clang.prog.mk" diff --git a/usr.bin/clang/lldb/Makefile b/usr.bin/clang/lldb/Makefile index 2ad02b7bba6e..ff5e0501412f 100644 --- a/usr.bin/clang/lldb/Makefile +++ b/usr.bin/clang/lldb/Makefile @@ -16,7 +16,7 @@ SRCS= Driver.cpp \ # Man page directory .PATH: ${LLDB_SRCS}/docs -LIBADD= edit panel ncursesw execinfo z +LIBADD+= edit panel ncursesw execinfo z LLDB_LIBS=\ lldb \ diff --git a/usr.bin/clang/lli/Makefile b/usr.bin/clang/lli/Makefile index 149602ee7702..f824a00b42dc 100644 --- a/usr.bin/clang/lli/Makefile +++ b/usr.bin/clang/lli/Makefile @@ -47,6 +47,6 @@ LIBDEPS=llvmx86disassembler \ llvmcore \ llvmsupport -LIBADD= z +LIBADD+= z .include "../clang.prog.mk" diff --git a/usr.bin/clang/llvm-ar/Makefile b/usr.bin/clang/llvm-ar/Makefile index 8be2741df7a5..60520671c32d 100644 --- a/usr.bin/clang/llvm-ar/Makefile +++ b/usr.bin/clang/llvm-ar/Makefile @@ -68,6 +68,6 @@ LIBDEPS=llvmlibdriver \ llvmcore \ llvmsupport -LIBADD= z +LIBADD+= z .include "../clang.prog.mk" diff --git a/usr.bin/clang/llvm-cov/Makefile b/usr.bin/clang/llvm-cov/Makefile index f752034bda58..cca47540d0c6 100644 --- a/usr.bin/clang/llvm-cov/Makefile +++ b/usr.bin/clang/llvm-cov/Makefile @@ -22,4 +22,6 @@ LIBDEPS=llvmprofiledata \ llvmcore \ llvmsupport +LIBADD+= z + .include "../clang.prog.mk" diff --git a/usr.bin/clang/llvm-cxxdump/Makefile b/usr.bin/clang/llvm-cxxdump/Makefile index 0c2e97889e86..33a08a9fd333 100644 --- a/usr.bin/clang/llvm-cxxdump/Makefile +++ b/usr.bin/clang/llvm-cxxdump/Makefile @@ -66,6 +66,6 @@ LIBDEPS=llvmaarch64disassembler \ llvmcore \ llvmsupport -LIBADD= z +LIBADD+= z .include "../clang.prog.mk" diff --git a/usr.bin/clang/llvm-dwarfdump/Makefile b/usr.bin/clang/llvm-dwarfdump/Makefile index dab8e377d5ac..32f3afa0727f 100644 --- a/usr.bin/clang/llvm-dwarfdump/Makefile +++ b/usr.bin/clang/llvm-dwarfdump/Makefile @@ -15,6 +15,6 @@ LIBDEPS=llvmdebuginfodwarf \ llvmcore \ llvmsupport -LIBADD= z +LIBADD+= z .include "../clang.prog.mk" diff --git a/usr.bin/clang/llvm-lto/Makefile b/usr.bin/clang/llvm-lto/Makefile index 0c1fe27410bd..3e0dc8347b2a 100644 --- a/usr.bin/clang/llvm-lto/Makefile +++ b/usr.bin/clang/llvm-lto/Makefile @@ -75,6 +75,6 @@ LIBDEPS=llvmaarch64disassembler \ llvmcore \ llvmsupport -LIBADD= z +LIBADD+= z .include "../clang.prog.mk" diff --git a/usr.bin/clang/llvm-mc/Makefile b/usr.bin/clang/llvm-mc/Makefile index e6a29ad0a071..b19ea9015402 100644 --- a/usr.bin/clang/llvm-mc/Makefile +++ b/usr.bin/clang/llvm-mc/Makefile @@ -66,6 +66,6 @@ LIBDEPS=llvmaarch64disassembler \ llvmcore \ llvmsupport -LIBADD= z +LIBADD+= z .include "../clang.prog.mk" diff --git a/usr.bin/clang/llvm-nm/Makefile b/usr.bin/clang/llvm-nm/Makefile index 23d3e6ab36f7..7eb9d9f0f586 100644 --- a/usr.bin/clang/llvm-nm/Makefile +++ b/usr.bin/clang/llvm-nm/Makefile @@ -66,6 +66,6 @@ LIBDEPS=llvmaarch64disassembler \ llvmcore \ llvmsupport -LIBADD= z +LIBADD+= z .include "../clang.prog.mk" diff --git a/usr.bin/clang/llvm-objdump/Makefile b/usr.bin/clang/llvm-objdump/Makefile index ebcc2372931c..dcbf1f91240e 100644 --- a/usr.bin/clang/llvm-objdump/Makefile +++ b/usr.bin/clang/llvm-objdump/Makefile @@ -69,6 +69,6 @@ LIBDEPS=llvmdebuginfodwarf \ llvmcore \ llvmsupport -LIBADD= z +LIBADD+= z .include "../clang.prog.mk" diff --git a/usr.bin/clang/llvm-pdbdump/Makefile b/usr.bin/clang/llvm-pdbdump/Makefile index 5487490921c8..72d6214c4dc2 100644 --- a/usr.bin/clang/llvm-pdbdump/Makefile +++ b/usr.bin/clang/llvm-pdbdump/Makefile @@ -26,6 +26,6 @@ LIBDEPS=llvmdebuginfopdb \ llvmcore \ llvmsupport -LIBADD= z +LIBADD+= z .include "../clang.prog.mk" diff --git a/usr.bin/clang/llvm-profdata/Makefile b/usr.bin/clang/llvm-profdata/Makefile index 7cd4ab6f7922..95fc7e55133c 100644 --- a/usr.bin/clang/llvm-profdata/Makefile +++ b/usr.bin/clang/llvm-profdata/Makefile @@ -17,4 +17,6 @@ LIBDEPS=llvmprofiledata \ llvmcore \ llvmsupport +LIBADD+= z + .include "../clang.prog.mk" diff --git a/usr.bin/clang/llvm-rtdyld/Makefile b/usr.bin/clang/llvm-rtdyld/Makefile index 453fe31f2137..3c5304b34904 100644 --- a/usr.bin/clang/llvm-rtdyld/Makefile +++ b/usr.bin/clang/llvm-rtdyld/Makefile @@ -69,6 +69,6 @@ LIBDEPS=llvmdebuginfodwarf \ llvmcore \ llvmsupport -LIBADD= z +LIBADD+= z .include "../clang.prog.mk" diff --git a/usr.bin/clang/llvm-symbolizer/Makefile b/usr.bin/clang/llvm-symbolizer/Makefile index 367a13995c3a..a71663bf5868 100644 --- a/usr.bin/clang/llvm-symbolizer/Makefile +++ b/usr.bin/clang/llvm-symbolizer/Makefile @@ -17,6 +17,6 @@ LIBDEPS=llvmsymbolize \ llvmcore \ llvmsupport -LIBADD= z +LIBADD+= z .include "../clang.prog.mk" diff --git a/usr.bin/clang/opt/Makefile b/usr.bin/clang/opt/Makefile index cf0c3cfb7f70..9285a3c21c3b 100644 --- a/usr.bin/clang/opt/Makefile +++ b/usr.bin/clang/opt/Makefile @@ -80,6 +80,6 @@ LIBDEPS=llvmpasses \ llvmcore \ llvmsupport -LIBADD= z +LIBADD+= z .include "../clang.prog.mk"