diff options
author | Bryan Drewery <bdrewery@FreeBSD.org> | 2015-12-01 05:22:10 +0000 |
---|---|---|
committer | Bryan Drewery <bdrewery@FreeBSD.org> | 2015-12-01 05:22:10 +0000 |
commit | a0eb270b125e75d3e36c2533749c4c196d4dbc39 (patch) | |
tree | 03629368c2e51c535e10191cd7b3ccf40f18aa96 /targets/pseudo/userland | |
parent | 3bed45ab81b42ff4029368ec778cd8700723c535 (diff) | |
download | src-a0eb270b125e75d3e36c2533749c4c196d4dbc39.tar.gz src-a0eb270b125e75d3e36c2533749c4c196d4dbc39.zip |
META MODE: Fix userland/cddl.
MK_CTF controls whether ctfmerge is ran against the binaries, not
whether CTF tools should be built.
Sponsored by: EMC / Isilon Storage Division
Notes
Notes:
svn path=/head/; revision=291562
Diffstat (limited to 'targets/pseudo/userland')
-rw-r--r-- | targets/pseudo/userland/cddl/Makefile.depend | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/targets/pseudo/userland/cddl/Makefile.depend b/targets/pseudo/userland/cddl/Makefile.depend index 00524e9f5281..f1224a2fba96 100644 --- a/targets/pseudo/userland/cddl/Makefile.depend +++ b/targets/pseudo/userland/cddl/Makefile.depend @@ -9,19 +9,17 @@ DIRDEPS = \ cddl/lib/drti \ cddl/lib/libavl \ + cddl/lib/libctf \ + cddl/lib/libdtrace \ cddl/lib/libnvpair \ cddl/lib/libumem \ cddl/lib/libuutil \ - - -DIRDEPS.CTF = \ - cddl/lib/libctf \ cddl/usr.bin/ctfconvert \ cddl/usr.bin/ctfdump \ cddl/usr.bin/ctfmerge \ - cddl/lib/libdtrace \ cddl/usr.sbin/dtrace \ cddl/usr.sbin/dtruss \ + cddl/usr.sbin/lockstat \ DIRDEPS.ZFS = \ @@ -33,12 +31,11 @@ DIRDEPS.ZFS = \ cddl/usr.bin/zinject \ cddl/usr.bin/zstreamdump \ cddl/usr.bin/ztest \ - cddl/usr.sbin/lockstat \ cddl/usr.sbin/zdb \ cddl/usr.sbin/zhack \ -.for O in CTF ZFS +.for O in ZFS .if ${MK_$O} == "yes" DIRDEPS+= ${DIRDEPS.$O} .endif |