diff --git a/src/tools/stage.jam b/src/tools/stage.jam index 5d4793ed8..aa27dfcc9 100644 --- a/src/tools/stage.jam +++ b/src/tools/stage.jam @@ -468,133 +468,3 @@ rule install ( name : sources * : requirements * : default-build * ) IMPORT $(__name__) : install : : install ; IMPORT $(__name__) : install : : stage ; - -rule add-variant-and-compiler ( name : type ? : property-set ) -{ - return [ rename $(name) : $(type) : $(property-set) ] ; -} - -rule add-variant ( name : type ? : property-set ) -{ - return [ rename $(name) : $(type) : $(property-set) : unversioned ] ; -} - -rule rename ( name : type ? : property-set : unversioned ? ) -{ - if [ type.is-derived $(type) LIB ] - { - local properties = [ $(property-set).raw ] ; - - local tags = ; - - local thread-tag ; - if multi in $(properties) { thread-tag = mt ; } - - local runtime-tag = ; - if static in $(properties) { runtime-tag += s ; } - if on in $(properties) { runtime-tag += g ; } - - if debug-python in $(properties) { runtime-tag += y ; } - if debug in $(properties) { runtime-tag += d ; } - if stlport in $(properties) { runtime-tag += p ; } - if hostios in $(properties) { runtime-tag += n ; } - - local toolset-tag = ; - # 'unversioned' should be a parameter. - if ! $(unversioned) - { - switch [ $(property-set).get ] - { - case borland* : toolset-tag += bcb ; - case como* : toolset-tag += como ; - case cw : toolset-tag += cw ; - case darwin* : toolset-tag += ; - case edg* : toolset-tag += edg ; - case gcc* : toolset-tag += gcc ; - case intel : - if [ $(property-set).get ] = win - { - toolset-tag += iw ; - } - else - { - toolset-tag += il ; - } - case kcc* : toolset-tag += kcc ; - case kylix* : toolset-tag += bck ; - #case metrowerks* : toolset-tag += cw ; - #case mingw* : toolset-tag += mgw ; - case mipspro* : toolset-tag += mp ; - case msvc* : toolset-tag += vc ; - case sun* : toolset-tag += sw ; - case tru64cxx* : toolset-tag += tru ; - case vacpp* : toolset-tag += xlc ; - } - local version = [ MATCH "([0123456789]+)[.]([0123456789]*)" : $(properties) ] ; - # For historical reasons, vc6.0 and vc7.0 use different - # naming. - if $(toolset-tag) = vc - { - if $(version[1]) = 6 - { - # Cancel minor version. - version = 6 ; - } - else if $(version[1]) = 7 && $(version[2]) = 0 - { - version = 7 ; - } - } - # On intel, version is not added, because it does not - # matter and it's the version of vc used as backend - # that matters. Ideally, we'd encode the backend - # version but that will break compatibility with - # V1. - if $(toolset-tag) = iw - { - version = ; - } - - # On borland, version is not added for compatibility - # with V1. - if $(toolset-tag) = bcb - { - version = ; - } - - toolset-tag += $(version) ; - } - - # Note yet clear if this should be added on Linux (where we have - # version in soname) and how it should be done on Windows. - #local version-tag = ; - #if ! $(gUNVERSIONED_VARIANT_TAG) - #{ - # local version-number = [ get-values : $(properties) ] ; - # version-number ?= $(BOOST_VERSION) ; - # version-tag = [ MATCH "^([^.]+)[.]([^.]+)" : $(version-number[1]) ] ; - # version-tag = $(version-tag:J="_") ; - #} - - tags += $(toolset-tag:J=) ; - tags += $(thread-tag:J=) ; - tags += $(runtime-tag:J=) ; - #tags += $(version-tag) ; - - local result ; - - if $(tags) - { - result = $(name)-$(tags:J=-) ; - } - else - { - result = $(name) ; - } - return [ virtual-target.add-prefix-and-suffix $(result) : $(type) - : $(property-set) ] ; - } -} - - -