svn commit: r207928 - projects/clangbsd

[Roman Divacky]

Author: rdivacky
Date: Tue May 11 18:09:24 2010
New Revision: 207928
URL: http://svn.freebsd.org/changeset/base/207928

Log:
  Fix mergemaster by not linking as/ld in a case that they dont
  exist.
  
  Reported by:	markm

Modified:
  projects/clangbsd/Makefile.inc1

Modified: projects/clangbsd/Makefile.inc1
==============================================================================
--- projects/clangbsd/Makefile.inc1	Tue May 11 17:21:54 2010	(r207927)
+++ projects/clangbsd/Makefile.inc1	Tue May 11 18:09:24 2010	(r207928)
@@ -434,8 +434,9 @@ everything:
 	@echo "--------------------------------------------------------------"
 	@echo ">>> stage 4.4: building everything"
 	@echo "--------------------------------------------------------------"
-	ln -sf ${WORLDTMP}/usr/bin/as ${WORLDTMP}/usr/lib/as
-	ln -sf ${WORLDTMP}/usr/bin/ld ${WORLDTMP}/usr/lib/ld
+	# mergemaster goes through this but those files do not exist
+	[ -e ${WORLDTMP}/usr/bin/as ] && ln -sf ${WORLDTMP}/usr/bin/as ${WORLDTMP}/usr/lib/as
+	[ -e ${WORLDTMP}/usr/bin/ld ] && ln -sf ${WORLDTMP}/usr/bin/ld ${WORLDTMP}/usr/lib/ld
 	${_+_}cd ${.CURDIR}; ${WMAKE} par-all
 .if ${TARGET_ARCH} == "amd64"
 build32: