From 8f9bf0d66165c109f766136e0bce4b9113fb7a2d Mon Sep 17 00:00:00 2001 From: Ruslan Bukin Date: Tue, 26 Jan 2016 14:34:40 +0000 Subject: [PATCH] Remove uathload from build due to issue with GCC 5.2.0: "ld: --relax and -r may not be used together." Requires fixing ld command line arguments and testing. --- usr.sbin/Makefile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/usr.sbin/Makefile b/usr.sbin/Makefile index 16feb68073a5..86b5247132b5 100644 --- a/usr.sbin/Makefile +++ b/usr.sbin/Makefile @@ -194,7 +194,9 @@ SUBDIR.${MK_TIMED}+= timed SUBDIR.${MK_TOOLCHAIN}+= config SUBDIR.${MK_TOOLCHAIN}+= crunch SUBDIR.${MK_UNBOUND}+= unbound +.if !(${COMPILER_TYPE} == "gcc" && ${COMPILER_VERSION} >= 50200) SUBDIR.${MK_USB}+= uathload +.endif SUBDIR.${MK_USB}+= uhsoctl SUBDIR.${MK_USB}+= usbconfig SUBDIR.${MK_USB}+= usbdump