Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 10 Apr 2014 14:44:53 +0000 (UTC)
From:      Baptiste Daroussin <bapt@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r350809 - head/Mk
Message-ID:  <201404101444.s3AEirIt078227@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
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



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201404101444.s3AEirIt078227>