diff options
| author | Kenneth Heafield <kheafiel@cluster01.lti.ece.cmu.local> | 2012-05-12 15:18:29 -0400 |
|---|---|---|
| committer | Kenneth Heafield <kheafiel@cluster01.lti.ece.cmu.local> | 2012-05-12 15:18:29 -0400 |
| commit | a65a80c5d5b6fc4cbd32280f07cae9be71551b70 (patch) | |
| tree | 896209332f4b9b85dd34418d1887a664550c77d2 /jam-files | |
| parent | a097d3ea4132ba4c39c670185a3f4237d24030f9 (diff) | |
with-google-hash option, more respect for environment variables
Diffstat (limited to 'jam-files')
| -rw-r--r-- | jam-files/sanity.jam | 12 |
1 files changed, 7 insertions, 5 deletions
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 ; |