Patch for common-stage-tag rule

From: John Maddock (boost.regex_at_[hidden])
Date: 2003-09-01 05:43:15

Rene,

I've concocted the patch below to fix the <threading>multi naming problem
with msvc: basically the library name should be mangled for threads whenever
<runtime-link>dynamic is used (because thread support is always on when this
option is used regardless of what <threading> option is used). The patch is
slightly simpler than it looks, because it's mainly just a reordering of
your logic (the toolset selection comes last, so that toolset specific build
variants can be detected and acted on). Let me know if you want me to go
ahead and commit,

Thanks,

John.

Index: boost-base.jam
===================================================================
RCS file: /cvsroot/boost/boost/tools/build/boost-base.jam,v
retrieving revision 1.93
diff -r1.93 boost-base.jam
2342a2343,2352
> local thread-tag = ;
> if <threading>multi in $(properties) { thread-tag = mt ; }
>
> local runtime-tag = ;
> if <runtime-link>static in $(properties) { runtime-tag += s ; }
> if <runtime-build>debug in $(properties) { runtime-tag += g ; }
> if [ MATCH .*(debug-python).* : $(variant) ] { runtime-tag += y ; }
> else { if [ MATCH .*(debug).* : $(variant) ] { runtime-tag += d ; } }
> if [ MATCH .*(stlport).* : $(toolset) ] { runtime-tag += p ; }
>
2359c2369,2373
< case *msvc* : toolset-tag += vc6 ;
---
> case *msvc* :
> {
> toolset-tag += vc6 ;
> if <runtime-link>dynamic in $(properties) { thread-tag =
mt
; }
> }
2363c2377,2381
< case *vc7* : toolset-tag += vc ;
---
> case *vc7* :
> {
> toolset-tag += vc ;
> if <runtime-link>dynamic in $(properties) { thread-tag =
mt
; }
> }
2365a2384
>
2367,2369d2385
<
< local thread-tag = ;
< if <threading>multi in $(properties) { thread-tag = mt ; }
2371,2377d2386
<
< local runtime-tag = ;
< if <runtime-link>static in $(properties) { runtime-tag += s ; }
< if <runtime-build>debug in $(properties) { runtime-tag += g ; }
< if [ MATCH .*(debug-python).* : $(variant) ] { runtime-tag += y ; }
< else { if [ MATCH .*(debug).* : $(variant) ] { runtime-tag += d ; } }
< if [ MATCH .*(stlport).* : $(toolset) ] { runtime-tag += p ; }
2457a2467
>