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

Handle property sets attached to toolset-version specifiers in

Browse Source 
toolset= and --toolset= autoconfiguration.


[SVN r36411]
This commit is contained in:
Dave Abrahams
2006-12-16 01:33:15 +00:00
parent 5005c64fa4
commit e286330104
1 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/build-system.jam
View File

@@ -138,10 +138,13 @@ local extra-build-request ;
if ! $(ignore-config)
{
for local toolset-version in $(option-toolsets) $(feature-toolsets)
for local t in $(option-toolsets) $(feature-toolsets)
{
local toolset = [ MATCH ([^-]+).* : $(toolset-version) ] ;
local version = [ MATCH [^-]+-(.+) : $(toolset-version) ] ;
# Parse toolset-version/properties
local (t-v,t,v) = [ MATCH (([^-/]+)-?([^/]+)?)/?.* : $(t) ] ;
local toolset-version = $((t-v,t,v)[1]) ;
local toolset = $((t-v,t,v)[2]) ;
local version = $((t-v,t,v)[3]) ;
if $(debug-config)
{
@@ -182,14 +185,14 @@ if ! $(ignore-config)
# make sure we get an appropriate property into the build request in
# case the user used the "--toolset=..." form
if ! $(toolset-version) in $(argv)
&& ! $(toolset-version) in $(feature-toolsets)
if ! $(t) in $(argv)
&& ! $(t) in $(feature-toolsets)
{
if $(debug-config)
{
ECHO notice: [cmdline-cfg] adding toolset=$(toolset-version) "to build request." ;
ECHO notice: [cmdline-cfg] adding toolset=$(t) "to build request." ;
}
extra-build-request += toolset=$(toolset-version) ;
extra-build-request += toolset=$(t) ;
}
}
}