From f3fef50a89e8e88da39e3c7000310c9e319d5cfc Mon Sep 17 00:00:00 2001
From: Kenneth Heafield <github@kheafield.com>
Date: Thu, 21 Jun 2012 12:35:18 -0400
Subject: Pull in build changes from Moses

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

diff --git a/jam-files/sanity.jam b/jam-files/sanity.jam
index 957f4f43..aefed9c0 100644
--- a/jam-files/sanity.jam
+++ b/jam-files/sanity.jam
@@ -19,9 +19,8 @@ ldflags = [ os.environ "LDFLAGS" ] ;
 
 #Run g++ with empty main and these arguments to see if it passes.  
 rule test_flags ( flags * ) {
-  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\"" ;
+  flags = $(cxxflags) $(ldflags) $(flags) ;
+  local cmd = "bash -c \"g++ "$(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) ;
@@ -159,8 +158,8 @@ rule external-lib ( name : search-path * ) {
 }
 
 {
-  #Boost jam's static clang is buggy.  
-  requirements += <cxxflags>$(cxxflags) <cflags>$(cflags) <linkflags>$(ldflags) <toolset>clang:<link>shared ;
+  #Boost jam's static clang for Linux is buggy.
+  requirements += <cxxflags>$(cxxflags) <cflags>$(cflags) <linkflags>$(ldflags) <os>LINUX,<toolset>clang:<link>shared ;
 
   #libSegFault prints a stack trace on segfault.  Link against it if available.  
   if [ test_flags "-lSegFault" ] {
-- 
cgit v1.2.3