Ticket #6286: root.diff

File root.diff, 1.2 KB (added by Vladimir Prus, 8 years ago)

Try 2 - root repo.

  • Jamroot

    diff --git a/Jamroot b/Jamroot
    index 7ed45cf..4b2778a 100644
    a b rule tag ( name : type ? : property-set )  
    186186    return [ boostcpp.tag $(name) : $(type) : $(property-set) ] ;
    187187}
    188188
     189rule python-tag ( name : type ? : property-set )
     190{
     191    return [ boostcpp.python-tag $(name) : $(type) : $(property-set) ] ;
     192}
     193
    189194rule handle-static-runtime ( properties * )
    190195{
    191196    # Using static runtime with shared libraries is impossible on Linux, and
  • boostcpp.jam

    diff --git a/boostcpp.jam b/boostcpp.jam
    index 7d7f941..3e728f5 100644
    a b rule tag ( name : type ? : property-set )  
    162162    }
    163163}
    164164
     165# Specialized tag function to use for libraries linking to Python.
     166# Appends value of --python-buildid if provided.
     167rule python-tag ( name : type ? : property-set )
     168{
     169    local result = $(name) ;
     170    if $(type) in STATIC_LIB SHARED_LIB IMPORT_LIB && $(PYTHON_ID)
     171    {
     172        result = $(result)-$(PYTHON_ID) ;       
     173    }
     174   
     175    # forward to the boost tagging rule
     176    return  [ tag $(result) : $(type) : $(property-set) ] ;             
     177}
    165178
    166179################################################################################
    167180#