Date: Fri, 18 Sep 2015 21:36:30 +0000 (UTC) From: Bryan Drewery <bdrewery@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r287972 - head/include Message-ID: <201509182136.t8ILaUPQ087343@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: bdrewery Date: Fri Sep 18 21:36:29 2015 New Revision: 287972 URL: https://svnweb.freebsd.org/changeset/base/287972 Log: META_MODE: Avoid command changing in 2nd build. If the command to be ran changes then a rebuild is caused. Checking exists(${DESTDIR}...) from make results in this on the 2nd and possibly subsequent builds due to staging during build. Avoid this by always running the existence check in the make sh command. Sponsored by: EMC / Isilon Storage Division Modified: head/include/Makefile Modified: head/include/Makefile ============================================================================== --- head/include/Makefile Fri Sep 18 21:18:44 2015 (r287971) +++ head/include/Makefile Fri Sep 18 21:36:29 2015 (r287972) @@ -172,12 +172,12 @@ compat: copies: .for i in ${LDIRS} ${LSUBDIRS} ${LSUBSUBDIRS} crypto machine machine/pc \ ${_MARCHS} -.if exists(${DESTDIR}${INCLUDEDIR}/$i) - cd ${DESTDIR}${INCLUDEDIR}/$i; \ - for h in *.h; do \ - if [ -L $$h ]; then rm -f $$h; fi; \ - done -.endif + if [ -d ${DESTDIR}${INCLUDEDIR}/$i ]; then \ + cd ${DESTDIR}${INCLUDEDIR}/$i; \ + for h in *.h; do \ + if [ -L $$h ]; then rm -f $$h; fi; \ + done; \ + fi .endfor .for i in ${LDIRS} ${LSUBDIRS:Ndev/agp:Ndev/acpica:Ndev/bktr:Ndev/nand:Ndev/pci} ${LSUBSUBDIRS} cd ${.CURDIR}/../sys; \
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201509182136.t8ILaUPQ087343>