forked from premiere/premiere-libtorrent
fPIC related improvements to Jamfile
This commit is contained in:
parent
325f9babe8
commit
8a0fa577b1
21
Jamfile
21
Jamfile
|
@ -110,10 +110,26 @@ rule linking ( properties * )
|
||||||
{
|
{
|
||||||
if <boost-link>static in $(properties)
|
if <boost-link>static in $(properties)
|
||||||
{
|
{
|
||||||
result += <library>/boost/thread//boost_thread/<link>static
|
if <toolset>gcc in $(properties) && <link>shared in $(properties)
|
||||||
<library>/boost/filesystem//boost_filesystem/<link>static
|
{
|
||||||
|
result += <fpic>on ;
|
||||||
|
}
|
||||||
|
|
||||||
|
result += <library>/boost/filesystem//boost_filesystem/<link>static
|
||||||
<library>/boost/system//boost_system/<link>static
|
<library>/boost/system//boost_system/<link>static
|
||||||
;
|
;
|
||||||
|
|
||||||
|
# if we're building a shared library
|
||||||
|
# we need to link dynamically against the
|
||||||
|
# pthread library
|
||||||
|
if <fpic>on in $(properties) && <target-os>linux in $(properties)
|
||||||
|
{
|
||||||
|
result += <library>/boost/thread//boost_thread/<link>shared ;
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
result += <library>/boost/thread//boost_thread/<link>static ;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
@ -251,6 +267,7 @@ feature test-coverage : off on : composite propagated ;
|
||||||
|
|
||||||
feature fpic : off on : composite propagated link-incompatible ;
|
feature fpic : off on : composite propagated link-incompatible ;
|
||||||
feature.compose <fpic>on : <cflags>-fPIC ;
|
feature.compose <fpic>on : <cflags>-fPIC ;
|
||||||
|
feature.compose <fpic>off : <toolset>darwin:<cflags>-mdynamic-no-pic ;
|
||||||
|
|
||||||
feature visibility : defeault hidden : composite propagated link-incompatible ;
|
feature visibility : defeault hidden : composite propagated link-incompatible ;
|
||||||
feature.compose <visibility>hidden : <cflags>-fvisibility=hidden ;
|
feature.compose <visibility>hidden : <cflags>-fvisibility=hidden ;
|
||||||
|
|
Loading…
Reference in New Issue