svn commit: r217100 - head/share/mk

[ Available lists | Index of svn-src-all | Month of Jan 2011 | Week of 7 Jan 2011 | Raw email | View thread | Wrap long lines | Reply | Tag ]
From
Konstantin Belousov <kib@FreeBSD.org>
Date
7 Jan 2011 14:32:29
Subject
svn commit: r217100 - head/share/mk
Message-ID
201101071432.p07EWToA055439@svn.freebsd.org


[ Hide this part ]
Author: kib
Date: Fri Jan 7 14:32:29 2011
New Revision: 217100
URL: http://svn.freebsd.org/changeset/base/217100

Log:
Introduce make variable ACFLAGS used to supply additional flags to
cc driver when compiling assembler source file that is preprocessed.

Modified:
head/share/mk/bsd.lib.mk
head/share/mk/sys.mk

Modified: head/share/mk/bsd.lib.mk
==============================================================================
--- head/share/mk/bsd.lib.mk Fri Jan 7 14:28:54 2011 (r217099)
+++ head/share/mk/bsd.lib.mk Fri Jan 7 14:32:29 2011 (r217100)
@@ -120,26 +120,27 @@ PO_FLAG=-pg
${CTFCONVERT} ${CTFFLAGS} ${.TARGET})

.asm.po:
- ${CC} -x assembler-with-cpp -DPROF ${PO_CFLAGS} -c ${.IMPSRC} -o ${.TARGET}
+ ${CC} -x assembler-with-cpp -DPROF ${PO_CFLAGS} ${ACFLAGS} \
+ -c ${.IMPSRC} -o ${.TARGET}
@[ -z "${CTFCONVERT}" -o -n "${NO_CTF}" ] || \
(${ECHO} ${CTFCONVERT} ${CTFFLAGS} ${.TARGET} && \
${CTFCONVERT} ${CTFFLAGS} ${.TARGET})

.asm.So:
- ${CC} -x assembler-with-cpp ${PICFLAG} -DPIC ${CFLAGS} \
+ ${CC} -x assembler-with-cpp ${PICFLAG} -DPIC ${CFLAGS} ${ACFLAGS} \
-c ${.IMPSRC} -o ${.TARGET}
@[ -z "${CTFCONVERT}" -o -n "${NO_CTF}" ] || \
(${ECHO} ${CTFCONVERT} ${CTFFLAGS} ${.TARGET} && \
${CTFCONVERT} ${CTFFLAGS} ${.TARGET})

.S.po:
- ${CC} -DPROF ${PO_CFLAGS} -c ${.IMPSRC} -o ${.TARGET}
+ ${CC} -DPROF ${PO_CFLAGS} ${ACFLAGS} -c ${.IMPSRC} -o ${.TARGET}
@[ -z "${CTFCONVERT}" -o -n "${NO_CTF}" ] || \
(${ECHO} ${CTFCONVERT} ${CTFFLAGS} ${.TARGET} && \
${CTFCONVERT} ${CTFFLAGS} ${.TARGET})

.S.So:
- ${CC} ${PICFLAG} -DPIC ${CFLAGS} -c ${.IMPSRC} -o ${.TARGET}
+ ${CC} ${PICFLAG} -DPIC ${CFLAGS} ${ACFLAGS} -c ${.IMPSRC} -o ${.TARGET}
@[ -z "${CTFCONVERT}" -o -n "${NO_CTF}" ] || \
(${ECHO} ${CTFCONVERT} ${CTFFLAGS} ${.TARGET} && \
${CTFCONVERT} ${CTFFLAGS} ${.TARGET})

Modified: head/share/mk/sys.mk
==============================================================================
--- head/share/mk/sys.mk Fri Jan 7 14:28:54 2011 (r217099)
+++ head/share/mk/sys.mk Fri Jan 7 14:32:29 2011 (r217100)
@@ -41,6 +41,7 @@ RANLIB ?= ranlib

AS ?= as
AFLAGS ?=
+ACFLAGS ?=

.if defined(%POSIX)
CC ?= c89
@@ -275,13 +276,13 @@ YFLAGS ?= -d
${FC} ${RFLAGS} ${EFLAGS} ${FFLAGS} -c ${.IMPSRC}

.S.o:
- ${CC} ${CFLAGS} -c ${.IMPSRC}
+ ${CC} ${CFLAGS} ${ACFLAGS} -c ${.IMPSRC}
@[ -z "${CTFCONVERT}" -o -n "${NO_CTF}" ] || \
(${ECHO} ${CTFCONVERT} ${CTFFLAGS} ${.TARGET} && \
${CTFCONVERT} ${CTFFLAGS} ${.TARGET})

.asm.o:
- ${CC} -x assembler-with-cpp ${CFLAGS} -c ${.IMPSRC}
+ ${CC} -x assembler-with-cpp ${CFLAGS} ${ACFLAGS} -c ${.IMPSRC}
@[ -z "${CTFCONVERT}" -o -n "${NO_CTF}" ] || \
(${ECHO} ${CTFCONVERT} ${CTFFLAGS} ${.TARGET} && \
${CTFCONVERT} ${CTFFLAGS} ${.TARGET})


Elapsed time: 0.093 seconds