From owner-svn-ports-head@FreeBSD.ORG  Fri May 29 21:32:44 2015
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
Delivered-To: svn-ports-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 819235B2;
 Fri, 29 May 2015 21:32:44 +0000 (UTC) (envelope-from dim@FreeBSD.org)
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 6FEE41A49;
 Fri, 29 May 2015 21:32:44 +0000 (UTC) (envelope-from dim@FreeBSD.org)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t4TLWig9010982;
 Fri, 29 May 2015 21:32:44 GMT (envelope-from dim@FreeBSD.org)
Received: (from dim@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id t4TLWiZe010981;
 Fri, 29 May 2015 21:32:44 GMT (envelope-from dim@FreeBSD.org)
Message-Id: <201505292132.t4TLWiZe010981@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: dim set sender to dim@FreeBSD.org
 using -f
From: Dimitry Andric <dim@FreeBSD.org>
Date: Fri, 29 May 2015 21:32:44 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r387893 - head/textproc/kenlm/files
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head/>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 29 May 2015 21:32:44 -0000

Author: dim (src committer)
Date: Fri May 29 21:32:43 2015
New Revision: 387893
URL: https://svnweb.freebsd.org/changeset/ports/387893

Log:
  In PR200475, it turned out textproc/kenlm is using "CC" to do a sanity
  check at bootstrap time.  Make it use ${CXX} instead.
  
  Approved by:	demon (maintainer)
  PR:		200475, 200527

Modified:
  head/textproc/kenlm/files/patch-jam-files-sanity.jam

Modified: head/textproc/kenlm/files/patch-jam-files-sanity.jam
==============================================================================
--- head/textproc/kenlm/files/patch-jam-files-sanity.jam	Fri May 29 21:31:06 2015	(r387892)
+++ head/textproc/kenlm/files/patch-jam-files-sanity.jam	Fri May 29 21:32:43 2015	(r387893)
@@ -1,11 +1,19 @@
 --- jam-files/sanity.jam.orig	2014-04-21 07:58:19.000000000 +0400
 +++ jam-files/sanity.jam	2014-08-31 00:16:40.000000000 +0400
-@@ -148,7 +148,7 @@ rule boost-lib ( name macro : deps * ) {
+@@ -22,6 +22,7 @@ rule shell_or_fail ( cmd ) {
+   }
+ }
+ 
++cxx = [ os.environ "CXX" ] ;
+ cxxflags = [ os.environ "CXXFLAGS" ] ;
+ cflags = [ os.environ "CFLAGS" ] ;
+ ldflags = [ os.environ "LDFLAGS" ] ;
+@@ -148,7 +149,7 @@ rule boost-lib ( name macro : deps * ) {
  
  #Argument is e.g. 103600
  rule boost ( min-version ) {
 -  local cmd = "bash -c \"g++ "$(I-boost-include)" -dM -x c++ -E /dev/null -include boost/version.hpp 2>/dev/null |grep '#define BOOST_'\"" ;
-+  local cmd = "bash -c \"CC "$(I-boost-include)" -dM -x c++ -E /dev/null -include boost/version.hpp 2>/dev/null |grep '#define BOOST_'\"" ;
++  local cmd = "bash -c \"$(cxx) "$(I-boost-include)" -dM -x c++ -E /dev/null -include boost/version.hpp 2>/dev/null |grep '#define BOOST_'\"" ;
    local boost-shell = [ SHELL "$(cmd)" : exit-status ] ;
    if $(boost-shell[2]) != 0 && $(CLEANING) = no {
      echo Failed to run "$(cmd)" ;