d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Additional fix for -DNO_CLEAN build across r353340 and r353381

Browse Source 
opensolaris_atomic.S is now only used on i386 with opensolaris_atomic.c
used on other platforms.  After r353381 it doesn't exist on those
platforms so the stale dependency would result in a build error.

r353408 addressed this issue for cddl/lib/libzpool, but it persisted
with the opensolaris and zfs modules.
This commit is contained in:
Ed Maste 2019-10-21 18:40:03 +00:00
parent 279b9aabe3
commit dfe76e95ae
1 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Makefile.inc1
View File

@ -1620,6 +1620,18 @@ _cleankernobj_fast_depend_hack: .PHONY
rm -f ${OBJTOP}/sys/${KERNCONF}/assym.* \ rm -f ${OBJTOP}/sys/${KERNCONF}/assym.* \
${OBJTOP}/sys/${KERNCONF}/.depend.assym.*; \ ${OBJTOP}/sys/${KERNCONF}/.depend.assym.*; \
fi fi
# 20191009 r353340 removal of opensolaris_atomic.S (also r353381)
.if ${MACHINE} != i386
.for f in opensolaris_atomic
.for m in opensolaris zfs
@if [ -e "${KRNLOBJDIR}/${KERNCONF}/modules${SRCTOP}/sys/modules/${m}/.depend.${f}.o" ] && \
grep -q ${f}.S "${KRNLOBJDIR}/${KERNCONF}/modules${SRCTOP}/sys/modules/${m}/.depend.${f}.o"; then \
echo "Removing stale dependencies for opensolaris_atomic"; \
rm -f ${KRNLOBJDIR}/${KERNCONF}/modules${SRCTOP}/sys/modules/${m}/.depend.${f}.*; \
fi
.endfor
.endfor
.endif
${WMAKE_TGTS:N_worldtmp:Nbuild${libcompat}} ${.ALLTARGETS:M_*:N_worldtmp}: .MAKE .PHONY ${WMAKE_TGTS:N_worldtmp:Nbuild${libcompat}} ${.ALLTARGETS:M_*:N_worldtmp}: .MAKE .PHONY