Attachment 157258 Details for Bug 200527 – Fix textproc/kenlm sanity Jamfile to use the CXX variable

[patch] Fix textproc/kenlm sanity Jamfile to use the CXX variable

textproc__kenlm-fix-jamfile-cxx-1.diff (text/plain), 1.35 KB, created by Dimitry Andric on 2015-05-29 21:17:08 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Dimitry Andric

Created: 2015-05-29 21:17:08 UTC

Size: 1.35 KB

patch

obsolete

>Index: textproc/kenlm/files/patch-jam-files-sanity.jam
>===================================================================
>--- textproc/kenlm/files/patch-jam-files-sanity.jam	(revision 387883)
>+++ textproc/kenlm/files/patch-jam-files-sanity.jam	(working copy)
>@@ -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)" ;

Actions: View | Diff

Attachments on bug 200527: 157258