Submit #2206

[PATCH] Libmagic doesn't compile with clang

Added by juanfra684 over 2 years ago. Updated over 2 years ago.

Status:ClosedStart date:
Priority:NormalDue date:
Assignee:-% Done:

0%

Category:-
Target version:-

Description

* -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

History

#1 Updated by pavalos over 2 years ago

  • Status changed from New to Closed

07b5fcf4530bc258ce8d95250e216bd7e339aecd should take care of this.

Thanks for the submission!

Also available in: Atom PDF