mirror of
https://github.com/boostorg/log.git
synced 2026-01-27 06:52:15 +00:00
Removed override of the default 32 bit x86 instruction sets as it is not needed since Boost.Build now defaults to i686. Also removed log-api propagation as it seems to break the build sometimes.
[SVN r84222]
This commit is contained in:
@@ -26,7 +26,7 @@ project.pop-current ;
|
||||
lib psapi ;
|
||||
lib ws2_32 ;
|
||||
|
||||
feature.feature log-api : generic winnt unix : propagated ;
|
||||
feature.feature log-api : generic winnt unix ;
|
||||
|
||||
rule select-instruction-set-flags ( properties * )
|
||||
{
|
||||
@@ -42,19 +42,6 @@ rule select-instruction-set-flags ( properties * )
|
||||
}
|
||||
result = <build>no ;
|
||||
}
|
||||
else if $(instruction_set) = i686 && ! <instruction-set> in $(properties)
|
||||
{
|
||||
# We override the default <instruction-set> (which is i386 in this case) with our custom compiler flags.
|
||||
# This hack is needed because Boost.Build fails to configure dependencies of this library if we modify <instruction-set> property.
|
||||
if <toolset>gcc in $(properties) || <toolset>clang in $(properties) || <toolset>intel-linux in $(properties) || <toolset>intel-darwin in $(properties)
|
||||
{
|
||||
result = <cxxflags>"-march=i686" ;
|
||||
}
|
||||
else if <toolset>msvc-7.1 in $(properties)
|
||||
{
|
||||
result = <cxxflags>"/G6" ;
|
||||
}
|
||||
}
|
||||
|
||||
return $(result) ;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user