From owner-svn-src-projects@FreeBSD.ORG  Sat May 29 13:05:42 2010
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 02D6A106564A;
	Sat, 29 May 2010 13:05:42 +0000 (UTC)
	(envelope-from rdivacky@FreeBSD.org)
Received: from svn.freebsd.org (unknown [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id E64898FC1D;
	Sat, 29 May 2010 13:05:41 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o4TD5fF1023221;
	Sat, 29 May 2010 13:05:41 GMT
	(envelope-from rdivacky@svn.freebsd.org)
Received: (from rdivacky@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o4TD5fK0023219;
	Sat, 29 May 2010 13:05:41 GMT
	(envelope-from rdivacky@svn.freebsd.org)
Message-Id: <201005291305.o4TD5fK0023219@svn.freebsd.org>
From: Roman Divacky <rdivacky@FreeBSD.org>
Date: Sat, 29 May 2010 13:05:41 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r208641 - projects/clangbsd
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
	tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 29 May 2010 13:05:42 -0000

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: