mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2024-11-28 01:06:17 +00:00
Code Issues Releases Activity

In PR200475, it turned out textproc/kenlm is using "CC" to do a sanity

Browse Source 
check at bootstrap time.  Make it use ${CXX} instead.

Approved by:	demon (maintainer)
PR:		200475, 200527
This commit is contained in:
Dimitry Andric 2015-05-29 21:32:43 +00:00
parent 4401a143ac
commit 1b1db9fc24
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=387893
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
textproc/kenlm/files/patch-jam-files-sanity.jam
View File

@ -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)" ;