diff options
author | Kenneth Heafield <github@kheafield.com> | 2012-08-06 18:41:49 +0400 |
---|---|---|
committer | Kenneth Heafield <github@kheafield.com> | 2012-08-06 18:41:49 +0400 |
commit | b52ed110b02dff440512ee241211f7f0238e82d1 (patch) | |
tree | 61a8d215010add5a8885c47b51786b00018ed9f5 /jam-files | |
parent | 650fcd69192c13e28eece2b827891d297c3e3a2d (diff) |
Build changes. --static will force static linkage.
--without-libsegfault will skip libSegFault.
Diffstat (limited to 'jam-files')
-rw-r--r-- | jam-files/sanity.jam | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/jam-files/sanity.jam b/jam-files/sanity.jam index 567a3b2e9..7c4cc0bec 100644 --- a/jam-files/sanity.jam +++ b/jam-files/sanity.jam @@ -54,11 +54,15 @@ rule test_library ( name ) { #Determine if a library can be compiled statically. rule auto-shared ( name : additional * ) { - additional ?= "" ; - if [ test_flags $(additional)" -static -l"$(name) ] { + if [ option.get "static" : : "yes" ] { return ; } else { - return "<link>shared" ; + additional ?= "" ; + if [ test_flags $(additional)" -static -l"$(name) ] { + return ; + } else { + return "<link>shared" ; + } } } @@ -151,10 +155,10 @@ rule external-lib ( name : search-path * ) { } requirements = ; -if [ option.get "nosegfault" : "false" : "true" ] = "false" { - #Boost jam's static clang for Linux is buggy. - requirements += <cxxflags>$(cxxflags) <cflags>$(cflags) <linkflags>$(ldflags) <os>LINUX,<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 ; +if ! [ option.get "without-libsegfault" : : "yes" ] && ! [ option.get "static" : : "yes" ] { #libSegFault prints a stack trace on segfault. Link against it if available. if [ test_flags "-lSegFault" ] { external-lib SegFault ; |