mirror of
https://github.com/boostorg/boost.git
synced 2025-04-07 22:39:25 +00:00
Make the version/variant tag conform to BBv1 behaviour.
[SVN r28439]
This commit is contained in:
parent
7ad4759f1f
commit
1ab69d50c2
2 changed files with 9 additions and 6 deletions
13
Jamfile.v2
13
Jamfile.v2
|
@ -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
|
Loading…
Add table
Reference in a new issue