Date: Sat, 29 May 2010 13:05:41 +0000 (UTC) From: Roman Divacky <rdivacky@FreeBSD.org> To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r208641 - projects/clangbsd Message-ID: <201005291305.o4TD5fK0023219@svn.freebsd.org>
index | next in thread | raw e-mail
Author: rdivacky Date: Sat May 29 13:05:41 2010 New Revision: 208641 URL: http://svn.freebsd.org/changeset/base/208641 Log: Fix the mergemaster problem properly by changing the condition so it never evaluates to false thus the target does not fail. Submitted by: Dimitry Andric <dimitry andric com> Modified: projects/clangbsd/Makefile.inc1 Modified: projects/clangbsd/Makefile.inc1 ============================================================================== --- projects/clangbsd/Makefile.inc1 Sat May 29 09:15:40 2010 (r208640) +++ projects/clangbsd/Makefile.inc1 Sat May 29 13:05:41 2010 (r208641) @@ -433,8 +433,8 @@ everything: @echo ">>> stage 4.4: building everything" @echo "--------------------------------------------------------------" # 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 + [ ! -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:help
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201005291305.o4TD5fK0023219>