Index: b/usr/src/tools/ctf/Makefile
===================================================================
--- a/usr/src/tools/ctf/Makefile	2014-03-02 01:31:36.854157502 +0400
+++ b/usr/src/tools/ctf/Makefile	2014-03-02 01:31:52.558629814 +0400
@@ -38,7 +38,7 @@
 
 .KEEP_STATE:
 
-all clean clobber install lint: dwarf .WAIT $(SUBDIRS)
+all clean clobber install lint: .WAIT $(SUBDIRS)
 
 dwarf $(SUBDIRS): FRC
 	@cd $@; pwd; $(MAKE) $(TARGET)
Index: b/usr/src/tools/ctf/cvt/Makefile.com
===================================================================
--- a/usr/src/tools/ctf/cvt/Makefile.com	2014-03-02 01:31:36.854019531 +0400
+++ b/usr/src/tools/ctf/cvt/Makefile.com	2014-03-02 01:31:52.560334801 +0400
@@ -66,15 +66,7 @@
 SRCS=$(CVTSRCS) $(MRGSRCS) $(CMPSRCS)
 OBJS=$(SRCS:%.c=%.o)
 LINTFILES=$(SRCS:%.c=%.ln)
-
-DWARFLDFLAGS	= \
-	-L$(ROOTONBLDLIBMACH) \
-	'-R$$ORIGIN/../../lib/$(MACH)' \
-	-ldwarf
-DWARFCPPFLAGS	= -I../../dwarf/common
-
-LDFLAGS		+= -L$(NATIVE_ADJUNCT)/lib
-LDLIBS		+= -lz -lelf
+LDLIBS		+= -lz -lelf -ldwarf
 CPPFLAGS	+= -D_REENTRANT
 CFLAGS		+= $(CTF_FLAGS)
 LINTFLAGS	+= -mnux
@@ -85,6 +77,3 @@
 
 C99MODE		= $(C99_ENABLE)
 
-ctfconvert	:= LDFLAGS += $(DWARFLDFLAGS)
-
-dwarf.o dwarf.ln	:= CPPFLAGS += $(DWARFCPPFLAGS)