From 2f64af3e06a518b93f7ca2c30a9d0aeb2c947031 Mon Sep 17 00:00:00 2001
From: Kenneth Heafield <kheafiel@cluster01.lti.ece.cmu.local>
Date: Sat, 12 May 2012 15:18:29 -0400
Subject: with-google-hash option, more respect for environment variables

---
 jam-files/sanity.jam | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

(limited to 'jam-files/sanity.jam')

diff --git a/jam-files/sanity.jam b/jam-files/sanity.jam
index eeb59f6e..9c75c247 100644
--- a/jam-files/sanity.jam
+++ b/jam-files/sanity.jam
@@ -13,9 +13,15 @@ rule _shell ( cmd : extras * ) {
   return [ trim-nl [ SHELL $(cmd) : $(extras) ] ] ;
 }
 
+cxxflags = [ os.environ "CXXFLAGS" ] ;
+cflags = [ os.environ "CFLAGS" ] ;
+ldflags = [ os.environ "LDFLAGS" ] ;
+
 #Run g++ with empty main and these arguments to see if it passes.  
 rule test_flags ( flags * ) {
-  local cmd = "bash -c \"g++ "$(flags:J=" ")" -x c++ - <<<'int main() {}' -o /dev/null >/dev/null 2>/dev/null\"" ;
+  local add = $(CXXFLAGS) $(LDFLAGS) ;
+  add ?= "" ;
+  local cmd = "bash -c \"g++ $(add) "$(flags:J=" ")" -x c++ - <<<'int main() {}' -o /dev/null >/dev/null 2>/dev/null\"" ;
   local ret = [ SHELL $(cmd) : exit-status ] ;
   if --debug-configuration in [ modules.peek : ARGV ] {
     echo $(cmd) ;
@@ -144,10 +150,6 @@ rule external-lib ( name : search-path * ) {
 
 requirements = ;
 {
-  local cxxflags = [ os.environ "CXXFLAGS" ] ;
-  local cflags = [ os.environ "CFLAGS" ] ;
-  local ldflags = [ os.environ "LDFLAGS" ] ;
-
   #Boost jam's static clang is buggy.  
   requirements += <cxxflags>$(cxxflags) <cflags>$(cflags) <linkflags>$(ldflags) <toolset>clang:<link>shared ;
 
-- 
cgit v1.2.3