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

Attempt to properly detect free VC 7.1 tools.

Browse Source 
[SVN r22808]
This commit is contained in:
Vladimir Prus
2004-05-13 10:51:44 +00:00
parent 69f6a8af18
commit c928643a1f
1 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
v2/tools/msvc.jam
View File

@@ -58,6 +58,9 @@ feature.subfeature toolset msvc : vendor
#
# When invoking tools, we'll first run vcvars32.bat from the configured path and
# then cl/link, without path.
#
# Note: for free VC7.1 tools, we don't correctly find vcvars32.bar when user
# explicitly provides a path.
rule init (
version ? # the msvc version which is being configured. When omitted
# the tools invoked when no explicit version is given will be configured.
@@ -189,7 +192,13 @@ local rule locate ( setup : version ? : vendor ? )
version-7.1-path = [ path.join $(version-7.1-path) "VC7" ] ;
version-7.1-path = [ path.native $(version-7.1-path) ] ;
}
local VCToolkitInstallDir = [ modules.peek : VCToolkitInstallDir ] ;
if $(VCToolkitInstallDir)
{
version-7.1-path = [ path.make "$(VCToolkitInstallDir:J= )" ] ;
}
if $(version)
{
local v = [ MATCH ^(6|[^6].*) : $(version) ] ;
@@ -200,7 +209,8 @@ local rule locate ( setup : version ? : vendor ? )
possible-paths += $(version-7.1-path) $(version-7.0-path) $(version-6-path) ;
}
# The vccars32.bat is actually in "bin" directory.
possible-paths = $(possible-paths)\\bin ;
# (except for free VC7.1 tools)
possible-paths = $(possible-paths)\\bin $(possible-paths) ;
}
# Append PATH