Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 1 Aug 2010 12:10:32 +0000 (UTC)
From:      Rui Paulo <rpaulo@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org
Subject:   svn commit: r210730 - head/lib/libmagic
Message-ID:  <201008011210.o71CAWvj097155@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: rpaulo
Date: Sun Aug  1 12:10:32 2010
New Revision: 210730
URL: http://svn.freebsd.org/changeset/base/210730

Log:
  Use CFLAGS and LDFLAGS when compiling mkmagic. This ensures that all the
  correct flags are being used (esp. NO_WERROR wrt clang).
  
  Submitted by:	Dimitry Andric <dimitry at andric.com>
  Reviewed by:	ru

Modified:
  head/lib/libmagic/Makefile

Modified: head/lib/libmagic/Makefile
==============================================================================
--- head/lib/libmagic/Makefile	Sun Aug  1 12:05:27 2010	(r210729)
+++ head/lib/libmagic/Makefile	Sun Aug  1 12:10:32 2010	(r210730)
@@ -40,8 +40,7 @@ magic.mgc: mkmagic magic
 CLEANFILES+=	mkmagic
 build-tools: mkmagic
 mkmagic: apprentice.c funcs.c magic.c print.c
-	${CC} -DHAVE_CONFIG_H -DCOMPILE_ONLY \
-	    -I${.CURDIR} -I${CONTRDIR} -o ${.TARGET} ${.ALLSRC}
+	${CC} ${CFLAGS} -DCOMPILE_ONLY ${LDFLAGS} -o ${.TARGET} ${.ALLSRC}
 
 FILEVER!= awk '$$1 == "\#define" && $$2 == "VERSION" { print $$3; exit }' \
 			${.CURDIR}/config.h



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201008011210.o71CAWvj097155>