svn commit: r350027 - head/Mk

[Baptiste Daroussin]

Author: bapt
Date: Thu Apr  3 16:29:01 2014
New Revision: 350027
URL: http://svnweb.freebsd.org/changeset/ports/350027
QAT: https://qat.redports.org/buildarchive/r350027/

Log:
  Define HCC and HCXX (host cc and host cxx when cross building)
  Simplify what need to be defined by directly using the cc in the sysroot instead of the one in LOCALBASE/bin
  which might call ${LOCALBASE}/bin/ld instead of the cross build ld (same for as) if binutils from ports is installed and a build system messes up with the CFLAGS

Modified:
  head/Mk/bsd.port.mk

Modified: head/Mk/bsd.port.mk
==============================================================================
--- head/Mk/bsd.port.mk	Thu Apr  3 16:24:17 2014	(r350026)
+++ head/Mk/bsd.port.mk	Thu Apr  3 16:29:01 2014	(r350027)
@@ -1138,17 +1138,15 @@ IGNORE=	Cross building is only compatibl
 .endif
 BUILD_DEPENDS=	${X_BUILD_FOR}-cc:${PORTSDIR}/devel/${X_BUILD_FOR}-xdev
 # Do not define CPP on purpose
-CC=		${X_BUILD_FOR}-cc
-CXX=	${X_BUILD_FOR}-c++
-LD=		${X_BUILD_FOR}-ld
-AS=		${X_BUILD_FOR}-as
+.if !defined(HCC)
+HCC:=	${CC}
+HCXX:=	${CXX}
+.endif
+CC=		${LOCALBASE}/${X_BUILD_FOR}/usr/bin/cc
+CXX=		${LOCALBASE}/${X_BUILD_FOR}/usr/bin/c++
 NM=		${X_BUILD_FOR}-nm
 STRIP_CMD=	${X_BUILD_FOR}-strip
-CFLAGS+=	-B${LOCALBASE}/${X_BUILD_FOR}/usr/bin
-CXXFLAGS+=	-B${LOCALBASE}/${X_BUILD_FOR}/usr/bin
-LDFLAGS+=	-B${LOCALBASE}/${X_BUILD_FOR}/usr/bin
-CONFIGURE_ENV+=	LD=${LD} AS=${AS} NM=${NM}
-MAKE_ENV+=	LD=${LD} AS=${AS} NM=${NM} STRIPBIN=${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
 .endif