Make the version/variant tag conform to BBv1 behaviour.

[SVN r28439]
This commit is contained in:
Rene Rivera 2005-04-23 16:36:59 +00:00
parent 7ad4759f1f
commit 1ab69d50c2
2 changed files with 9 additions and 6 deletions

View file

@ -138,24 +138,27 @@ rule tag ( name : type ? : property-set )
name = [ stage.add-variant-and-compiler $(name)
: $(type) : $(property-set) ] ;
local version-tag = [ MATCH "^([^.]+)[.]([^.]+)" : $(BOOST_VERSION[1]) ] ;
version-tag = $(version-tag:J="_") ;
# On NT, library with version suffix won't be recognized
# by linkers. On CYGWIN, we get strage duplicate symbol
# errors when library is generated with version suffix.
if [ $(property-set).get <os> ] in NT CYGWIN
{
return $(name:B)_$(BOOST_VERSION)$(name:S) ;
return $(name:B)-$(version-tag)$(name:S) ;
}
else
{
return $(name:B)_$(BOOST_VERSION)$(name:S).$(BOOST_VERSION) ;
}
return $(name:B)-$(version-tag)$(name:S).$(BOOST_VERSION) ;
}
}
else
{
return [ stage.add-variant-and-compiler $(name)
: $(type) : $(property-set) ] ;
}
}
}
}
}
# Install to system location.

@ -1 +1 @@
Subproject commit b1399c29ad03cfc9198729f1116349116e104abd
Subproject commit f191d632c37072dfeba5043a43d7934dc5e803ff