From owner-svn-ports-all@FreeBSD.ORG  Thu Apr 10 14:44:53 2014
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 71AEFC0;
 Thu, 10 Apr 2014 14:44:53 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 5EA7A1A49;
 Thu, 10 Apr 2014 14:44:53 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s3AEirk3078228;
 Thu, 10 Apr 2014 14:44:53 GMT (envelope-from bapt@svn.freebsd.org)
Received: (from bapt@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s3AEirIt078227;
 Thu, 10 Apr 2014 14:44:53 GMT (envelope-from bapt@svn.freebsd.org)
Message-Id: <201404101444.s3AEirIt078227@svn.freebsd.org>
From: Baptiste Daroussin <bapt@FreeBSD.org>
Date: Thu, 10 Apr 2014 14:44:53 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r350809 - head/Mk
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.17
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all/>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 10 Apr 2014 14:44:53 -0000

Author: bapt
Date: Thu Apr 10 14:44:52 2014
New Revision: 350809
URL: http://svnweb.freebsd.org/changeset/ports/350809
QAT: https://qat.redports.org/buildarchive/r350809/

Log:
  Allow regular make xdev to be used as a cross building env

Modified:
  head/Mk/bsd.port.mk

Modified: head/Mk/bsd.port.mk
==============================================================================
--- head/Mk/bsd.port.mk	Thu Apr 10 13:58:16 2014	(r350808)
+++ head/Mk/bsd.port.mk	Thu Apr 10 14:44:52 2014	(r350809)
@@ -1155,12 +1155,18 @@ BUILD_DEPENDS=	${X_BUILD_FOR}-cc:${PORTS
 HCC:=	${CC}
 HCXX:=	${CXX}
 .endif
+.if !exists(/usr/${X_BUILD_FOR}/usr/bin/cc)
 CC=		${LOCALBASE}/${X_BUILD_FOR}/usr/bin/cc
 CXX=		${LOCALBASE}/${X_BUILD_FOR}/usr/bin/c++
+PKG_ENV+=	ABI_FILE=${LOCALBASE}/${X_BUILD_FOR}/usr/lib/crt1.o
+.else
+CC=		/usr/${X_BUILD_FOR}/usr/bin/cc
+CXX=	/usr/${X_BUILD_FOR}/usr/bin/c++
+PKG_ENV+=	ABI_FILE=/usr/${X_BUILD_FOR}/usr/lib/crt1.o
+.endif
 NM=		${X_BUILD_FOR}-nm
 STRIP_CMD=	${X_BUILD_FOR}-strip
 MAKE_ENV+=	NM=${NM} STRIPBIN=${X_BUILD_FOR}-strip
-PKG_ENV+=	ABI_FILE=${LOCALBASE}/${X_BUILD_FOR}/usr/lib/crt1.o
 # only bmake support the below
 STRIPBIN=	${STRIP_CMD}
 .export.env STRIPBIN