boost/build
2
0
Fork 0
mirror of https://github.com/boostorg/build.git synced 2026-02-16 01:12:13 +00:00
Code Issues Projects Releases Wiki Activity

Fix detection of long toolset names in translation to short names.

Browse Source 
[SVN r25652]
This commit is contained in:
Rene Rivera
2004-10-11 01:29:11 +00:00
parent 438023f2c0
commit 8422292313
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
v1/boost-base.jam
View File

@@ -2607,10 +2607,10 @@ rule common-variant-tag ( toolset variant : properties * )
case sunpro* : toolset-tag += sw ;
case tru64cxx* : toolset-tag += tru ;
case vacpp* : toolset-tag += xlc ;
case vc[-][678][-]* :
case vc[678][_]* :
{
toolset-tag += vc ;
toolset-tag += [ MATCH "vc[-]([678])[-]([0123456789]*)" : $(toolset) ] ;
toolset-tag += [ MATCH "vc([678])[_]([0123456789]*)" : $(toolset) ] ;
}
case vc[678]* :
{
@@ -2620,7 +2620,7 @@ rule common-variant-tag ( toolset variant : properties * )
case * :
toolset-tag += [ MATCH "^([^-]*)" : $(toolset) ] ;
}
toolset-tag += [ MATCH "[-]([0123456789]+)[-]([0123456789]*)" : $(toolset) ] ;
toolset-tag += [ MATCH "[-]([0123456789]+)[_]([0123456789]*)" : $(toolset) ] ;
}
local version-tag = ;
@@ -2628,7 +2628,7 @@ rule common-variant-tag ( toolset variant : properties * )
{
local version-number = [ get-values <version> : $(properties) ] ;
version-number ?= $(BOOST_VERSION) ;
version-tag = [ MATCH "^([^-]+)[-]([^-]+)" : $(version-number[1]) ] ;
version-tag = [ MATCH "^([^-]+)[.]([^-]+)" : $(version-number[1]) ] ;
version-tag = $(version-tag:J="_") ;
}