DragonFly BSD
DragonFly submit List (threaded) for 2011-11
[Date Prev][Date Next]  [Thread Prev][Thread Next]  [Date Index][Thread Index]

[PATCH] Libmagic doesn't compile with clang


From: Juan Francisco Cantero Hurtado <iam@xxxxxxxxxxxx>
Date: Thu, 17 Nov 2011 03:13:35 +0100

 * -I- is obsolete. Changed to -iquote.

 * gcc is ignoring file.h. Fix for the error compiling with clang.
---
 lib/libmagic/Makefile |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/lib/libmagic/Makefile b/lib/libmagic/Makefile
index e339983..2151523 100644
--- a/lib/libmagic/Makefile
+++ b/lib/libmagic/Makefile
@@ -54,9 +54,9 @@ magic.mgc: mkmagic.nx magic
 CLEANFILES+=   mkmagic.nx
 build-tools: mkmagic.nx
 
-NXCFLAGS=	${LIBMAGIC_CDEFS} -DCOMPILE_ONLY -I${.OBJDIR} -I- -I${.CURDIR} -I${CONTRIBDIR}
+NXCFLAGS=	${LIBMAGIC_CDEFS} -DCOMPILE_ONLY -I${.OBJDIR} -iquote -I${.CURDIR} -I${CONTRIBDIR}
 NXCFLAGS+=	-DBOOTSTRAPPING
-mkmagic.nx: file.h apprentice.c funcs.c magic.c print.c
-	${NXCC} ${NXCFLAGS} ${NXLDFLAGS} ${.ALLSRC} ${NXLDLIBS} -o ${.TARGET}
+mkmagic.nx: apprentice.c funcs.c magic.c print.c
+	${NXCC} ${NXCFLAGS} ${NXLDFLAGS} ${.ALLSRC} ${NXLDLIBS} -include ${CONTRIBDIR}/file.h -o ${.TARGET}
 
 .include <bsd.lib.mk>
-- 
Juan Francisco Cantero Hurtado http://juanfra.info



[Date Prev][Date Next]  [Thread Prev][Thread Next]  [Date Index][Thread Index]