mirror of
https://git.FreeBSD.org/src.git
synced 2025-02-08 03:57:11 +00:00
There's no reason to keep separate AINC knob anymore.
The only real use of it (lib/libc/Makefile) has been fixed, and if necessary, the contents of AINC should be added to CFLAGS. Explained by: bde
This commit is contained in:
parent
cb33c884cd
commit
a51613b6da
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=117122
@ -114,16 +114,10 @@ depend: beforedepend ${DEPENDFILE} afterdepend
|
||||
# Split up the sources, and filter out headers and non-applicable flags.
|
||||
${DEPENDFILE}: ${SRCS}
|
||||
rm -f ${DEPENDFILE}
|
||||
.if ${SRCS:M*.[sS]} != ""
|
||||
.if ${SRCS:M*.[cSs]} != ""
|
||||
${MKDEPCMD} -f ${DEPENDFILE} -a ${MKDEP} \
|
||||
${CFLAGS:M-nostdinc*} ${CFLAGS:M-[BID]*} \
|
||||
${AINC} \
|
||||
${.ALLSRC:M*.[sS]}
|
||||
.endif
|
||||
.if ${SRCS:M*.c} != ""
|
||||
${MKDEPCMD} -f ${DEPENDFILE} -a ${MKDEP} \
|
||||
${CFLAGS:M-nostdinc*} ${CFLAGS:M-[BID]*} \
|
||||
${.ALLSRC:M*.c}
|
||||
${.ALLSRC:M*.[cSs]}
|
||||
.endif
|
||||
.if ${SRCS:M*.cc} != "" || ${SRCS:M*.C} != "" || ${SRCS:M*.cpp} != "" || \
|
||||
${SRCS:M*.cxx} != ""
|
||||
|
@ -71,23 +71,20 @@ PICFLAG=-fpic
|
||||
${OBJC} ${PICFLAG} -DPIC ${OBJCFLAGS} -c ${.IMPSRC} -o ${.TARGET}
|
||||
|
||||
.s.o .asm.o:
|
||||
${CC} -x assembler-with-cpp ${CFLAGS} ${AINC} -c \
|
||||
${.IMPSRC} -o ${.TARGET}
|
||||
${CC} -x assembler-with-cpp ${CFLAGS} -c ${.IMPSRC} -o ${.TARGET}
|
||||
|
||||
.s.po .asm.po:
|
||||
${CC} -x assembler-with-cpp -DPROF ${CFLAGS} ${AINC} -c \
|
||||
${.IMPSRC} -o ${.TARGET}
|
||||
${CC} -x assembler-with-cpp -DPROF ${CFLAGS} -c ${.IMPSRC} -o ${.TARGET}
|
||||
|
||||
.s.So .asm.So:
|
||||
${CC} -x assembler-with-cpp ${PICFLAG} -DPIC ${CFLAGS} \
|
||||
${AINC} -c ${.IMPSRC} -o ${.TARGET}
|
||||
-c ${.IMPSRC} -o ${.TARGET}
|
||||
|
||||
.S.po:
|
||||
${CC} -DPROF ${CFLAGS} ${AINC} -c ${.IMPSRC} -o ${.TARGET}
|
||||
${CC} -DPROF ${CFLAGS} -c ${.IMPSRC} -o ${.TARGET}
|
||||
|
||||
.S.So:
|
||||
${CC} ${PICFLAG} -DPIC ${CFLAGS} ${AINC} -c ${.IMPSRC} \
|
||||
-o ${.TARGET}
|
||||
${CC} ${PICFLAG} -DPIC ${CFLAGS} -c ${.IMPSRC} -o ${.TARGET}
|
||||
|
||||
all: objwarn
|
||||
|
||||
|
@ -206,7 +206,7 @@ MACHINE_ARCH ?= i386
|
||||
${FC} ${RFLAGS} ${EFLAGS} ${FFLAGS} -c ${.IMPSRC}
|
||||
|
||||
.S.o:
|
||||
${CC} ${CFLAGS} ${AINC} -c ${.IMPSRC}
|
||||
${CC} ${CFLAGS} -c ${.IMPSRC}
|
||||
|
||||
.s.o .asm.o:
|
||||
${AS} ${AFLAGS} -o ${.TARGET} ${.IMPSRC}
|
||||
|
Loading…
x
Reference in New Issue
Block a user