|
Lines 1-11
Link Here
|
| 1 |
--- jam-files/sanity.jam.orig 2014-04-21 07:58:19.000000000 +0400 |
1 |
--- jam-files/sanity.jam.orig 2014-04-21 07:58:19.000000000 +0400 |
| 2 |
+++ jam-files/sanity.jam 2014-08-31 00:16:40.000000000 +0400 |
2 |
+++ jam-files/sanity.jam 2014-08-31 00:16:40.000000000 +0400 |
| 3 |
@@ -148,7 +148,7 @@ rule boost-lib ( name macro : deps * ) { |
3 |
@@ -22,6 +22,7 @@ rule shell_or_fail ( cmd ) { |
|
|
4 |
} |
| 5 |
} |
| 4 |
|
6 |
|
|
|
7 |
+cxx = [ os.environ "CXX" ] ; |
| 8 |
cxxflags = [ os.environ "CXXFLAGS" ] ; |
| 9 |
cflags = [ os.environ "CFLAGS" ] ; |
| 10 |
ldflags = [ os.environ "LDFLAGS" ] ; |
| 11 |
@@ -148,7 +149,7 @@ rule boost-lib ( name macro : deps * ) { |
| 12 |
|
| 5 |
#Argument is e.g. 103600 |
13 |
#Argument is e.g. 103600 |
| 6 |
rule boost ( min-version ) { |
14 |
rule boost ( min-version ) { |
| 7 |
- local cmd = "bash -c \"g++ "$(I-boost-include)" -dM -x c++ -E /dev/null -include boost/version.hpp 2>/dev/null |grep '#define BOOST_'\"" ; |
15 |
- local cmd = "bash -c \"g++ "$(I-boost-include)" -dM -x c++ -E /dev/null -include boost/version.hpp 2>/dev/null |grep '#define BOOST_'\"" ; |
| 8 |
+ local cmd = "bash -c \"CC "$(I-boost-include)" -dM -x c++ -E /dev/null -include boost/version.hpp 2>/dev/null |grep '#define BOOST_'\"" ; |
16 |
+ local cmd = "bash -c \"$(cxx) "$(I-boost-include)" -dM -x c++ -E /dev/null -include boost/version.hpp 2>/dev/null |grep '#define BOOST_'\"" ; |
| 9 |
local boost-shell = [ SHELL "$(cmd)" : exit-status ] ; |
17 |
local boost-shell = [ SHELL "$(cmd)" : exit-status ] ; |
| 10 |
if $(boost-shell[2]) != 0 && $(CLEANING) = no { |
18 |
if $(boost-shell[2]) != 0 && $(CLEANING) = no { |
| 11 |
echo Failed to run "$(cmd)" ; |
19 |
echo Failed to run "$(cmd)" ; |