diff options
| author | dim <dim@FreeBSD.org> | 2015-05-30 05:32:43 +0800 |
|---|---|---|
| committer | dim <dim@FreeBSD.org> | 2015-05-30 05:32:43 +0800 |
| commit | ffd910611800e32bbc55feb880c615a06aa46e28 (patch) | |
| tree | 48b88b985d0688f97f1e1bec95fb2d43a6549872 /textproc/kenlm | |
| parent | 9f4fd3c719cb66af7a30d209dbecd8e7f78df3b7 (diff) | |
| download | freebsd-ports-gnome-ffd910611800e32bbc55feb880c615a06aa46e28.tar.gz freebsd-ports-gnome-ffd910611800e32bbc55feb880c615a06aa46e28.tar.zst freebsd-ports-gnome-ffd910611800e32bbc55feb880c615a06aa46e28.zip | |
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
Diffstat (limited to 'textproc/kenlm')
| -rw-r--r-- | textproc/kenlm/files/patch-jam-files-sanity.jam | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/textproc/kenlm/files/patch-jam-files-sanity.jam b/textproc/kenlm/files/patch-jam-files-sanity.jam index 344ddccb47bf..723cecf8d8da 100644 --- a/textproc/kenlm/files/patch-jam-files-sanity.jam +++ b/textproc/kenlm/files/patch-jam-files-sanity.jam @@ -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)" ; |