mirror of
https://git.freebsd.org/ports.git
synced 2025-06-07 22:00:31 -04:00
1b1db9fc24
check at bootstrap time. Make it use ${CXX} instead.
Approved by: demon (maintainer)
PR: 200475, 200527
19 lines
878 B
Text
19 lines
878 B
Text
--- 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
|
|
@@ -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 \"$(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)" ;
|