SYSTEM_COMPILER: Ensure there is not a stale compiler in WORLDTMP.
In a scenario of cross-building it is possible that an OBJDIR's WORLDTMP contains an older compiler in WORLDTMP/usr/bin/cc that is not rebuilt if SYSTEM_COMPILER logic is triggered. This compiler was still incorrectly used. Address this by removing WORLDTMP/usr/bin/cc and all of the hardlinked files associated with it. Also do this for c++ for GCC builds. Sponsored by: Dell EMC Isilon MFC after: 1 week
This commit is contained in:
parent
aa24f48b36
commit
9bb3819b32
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=320806
@ -761,7 +761,15 @@ _worldtmp: .PHONY
|
|||||||
.endif
|
.endif
|
||||||
.else
|
.else
|
||||||
rm -rf ${WORLDTMP}/legacy/usr/include
|
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)
|
||||||
|
|
||||||
# Our current approach to dependency tracking cannot cope with certain source
|
# Our current approach to dependency tracking cannot cope with certain source
|
||||||
# tree changes, particularly with respect to removing source files and
|
# tree changes, particularly with respect to removing source files and
|
||||||
|
Loading…
Reference in New Issue
Block a user