diff options
| author | Dimitry Andric <dim@FreeBSD.org> | 2014-12-04 17:38:32 +0000 |
|---|---|---|
| committer | Dimitry Andric <dim@FreeBSD.org> | 2014-12-04 17:38:32 +0000 |
| commit | 24ce0a02e52bfc1250ca553eca8b11080782de79 (patch) | |
| tree | e85f3ac5f61c7e8271dbd0d8e33107d5f7ba6b6d /tools | |
| parent | 2383695dc36b5c345e74d959d0267980f89b0625 (diff) | |
| parent | b42a6953a156ca06f9b7f1948319a539f3122e8d (diff) | |
| download | src-24ce0a02e52bfc1250ca553eca8b11080782de79.tar.gz src-24ce0a02e52bfc1250ca553eca8b11080782de79.zip | |
Merge ^/head r275387 through r275477.
Notes
Notes:
svn path=/projects/clang350-import/; revision=275479
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/build/mk/OptionalObsoleteFiles.inc | 5 | ||||
| -rw-r--r-- | tools/tools/usbtest/Makefile | 4 |
2 files changed, 8 insertions, 1 deletions
diff --git a/tools/build/mk/OptionalObsoleteFiles.inc b/tools/build/mk/OptionalObsoleteFiles.inc index ddd887958e54..a095dbc29a21 100644 --- a/tools/build/mk/OptionalObsoleteFiles.inc +++ b/tools/build/mk/OptionalObsoleteFiles.inc @@ -1200,6 +1200,11 @@ OLD_FILES+=usr/share/dict/words OLD_DIRS+=usr/share/dict .endif +.if ${MK_ELFTOOLCHAIN_TOOLS} == no +OLD_FILES+=usr/bin/elfcopy +OLD_FILES+=usr/share/man/man1/elfcopy.1.gz +.endif + #.if ${MK_EXAMPLES} == no # to be filled in #.endif diff --git a/tools/tools/usbtest/Makefile b/tools/tools/usbtest/Makefile index 1cc0c833e65e..c67449839c55 100644 --- a/tools/tools/usbtest/Makefile +++ b/tools/tools/usbtest/Makefile @@ -30,11 +30,13 @@ SRCS+= usbtest.c SRCS+= usb_msc_test.c SRCS+= usb_modem_test.c SRCS+= usb_control_ep_test.c +SYSDIR?= ${.CURDIR}/../../../sys +DPADD+= ${LIBUSB} LDADD+= -lusb WARNS= 3 -CFLAGS+= -I ${.CURDIR}/../../../sys/dev/usb/gadget +CFLAGS+= -I${SYSDIR}/dev/usb/gadget .include <bsd.prog.mk> |