diff options
| author | Kenneth Heafield <github@kheafield.com> | 2012-06-21 12:35:18 -0400 |
|---|---|---|
| committer | Kenneth Heafield <github@kheafield.com> | 2012-06-21 12:35:18 -0400 |
| commit | 93f768b5c9a0ab54c462901e4edddacc65cb8ecf (patch) | |
| tree | 14e615743293de27dcec51f208cc62e16a8c719a | |
| parent | 9d4cfa88a71c0cba9a7d3e21cb2b58f78b097b48 (diff) | |
Pull in build changes from Moses
| -rw-r--r-- | jam-files/sanity.jam | 9 |
1 files 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" ] { |