svn commit: r321337 - stable/11

[Bryan Drewery]

Author: bdrewery
Date: Fri Jul 21 17:55:40 2017
New Revision: 321337
URL: https://svnweb.freebsd.org/changeset/base/321337

Log:
  MFC r320806:
  
    SYSTEM_COMPILER: Ensure there is not a stale compiler in WORLDTMP.

Modified:
  stable/11/Makefile.inc1
Directory Properties:
  stable/11/   (props changed)

Modified: stable/11/Makefile.inc1
==============================================================================
--- stable/11/Makefile.inc1	Fri Jul 21 17:42:54 2017	(r321336)
+++ stable/11/Makefile.inc1	Fri Jul 21 17:55:40 2017	(r321337)
@@ -678,7 +678,15 @@ _worldtmp: .PHONY
 .endif
 .else
 	rm -rf ${WORLDTMP}/legacy/usr/include
-.endif
+.if ${USING_SYSTEM_COMPILER} == "yes"
+.for cc in cc c++
+	if [ -x ${WORLDTMP}/usr/bin/${cc} ]; then \
+		inum=$$(stat -f %i ${WORLDTMP}/usr/bin/${cc}); \
+		find ${WORLDTMP}/usr/bin -inum $${inum} -delete; \
+	fi
+.endfor
+.endif	# ${USING_SYSTEM_COMPILER} == "yes"
+.endif	# !defined(NO_CLEAN)
 .for _dir in \
     lib lib/casper usr legacy/bin legacy/usr
 	mkdir -p ${WORLDTMP}/${_dir}