svn commit: r430248 - head/devel/boost-libs

[Jan Beich]

Author: jbeich
Date: Sun Jan  1 11:45:28 2017
New Revision: 430248
URL: https://svnweb.freebsd.org/changeset/ports/430248

Log:
  devel/boost-libs: oops, work around ${CC} usage after r430247
  
  $ make -V '${MAKE_ARGS:M--toolset*}'
  /bin/sh: clang39: not found
  make: "/usr/ports/Mk/Uses/compiler.mk" line 69: warning: "clang39 --version" returned non-zero status
  make: "/usr/ports/Mk/Uses/compiler.mk" line 120: warning: "clang++39 -### /dev/null 2>&1" returned non-zero status
  --toolset=gcc
  
  PR:		213867
  MFH:		2016Q4 (r430247 followup)

Modified:
  head/devel/boost-libs/Makefile   (contents, props changed)

Modified: head/devel/boost-libs/Makefile
==============================================================================
--- head/devel/boost-libs/Makefile	Sun Jan  1 10:50:47 2017	(r430247)
+++ head/devel/boost-libs/Makefile	Sun Jan  1 11:45:28 2017	(r430248)
@@ -32,10 +32,11 @@ ICU_MAKE_ARGS_OFF=	boost.locale.icu=off
 MAKE_ARGS+=	--without-python
 ALL_TARGET=	stage
 
-.include <bsd.port.options.mk>
+.include <bsd.port.pre.mk>
 
-# XXX Avoid bsd.port.(pre|post).mk dance by only working around base compiler
-.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1100508 && ${ARCH} == aarch64 && ${CXX} == c++
+# XXX CHOSEN_COMPILER_VERSION isn't supported, so check CXX hasn't changed
+.if ${ARCH} == aarch64 && ${CXX} == c++ && \
+    ${COMPILER_TYPE} == clang && ${COMPILER_VERSION} < 39
 BUILD_DEPENDS+=	${CC}:devel/llvm${LLVM_VER}
 CC=		clang${LLVM_VER}
 CXX=		clang++${LLVM_VER}
@@ -64,4 +65,4 @@ post-install:
 		-e "s|%%PYTHON_LIBDIR%%|${PYTHON_LIBDIR}|g" \
 		-e "s|%%PYTHON_VERSION%%|${PYTHON_VERSION}|g" ${PKGMESSAGE}
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>