From 338c7840035afdb17e277e82a8a7dbee2b0ab7f2 Mon Sep 17 00:00:00 2001 From: Dave Abrahams Date: Mon, 21 Jul 2003 07:26:45 +0000 Subject: [PATCH] Make it possible to account for PSDK [SVN r19244] --- src/tools/msvc.jam | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/tools/msvc.jam b/src/tools/msvc.jam index 6caa860f9..0bff4df54 100644 --- a/src/tools/msvc.jam +++ b/src/tools/msvc.jam @@ -85,7 +85,7 @@ rule init ( if ! $(path) { - setup = [ locate $(version) : $(vendor) ] ; + setup = [ locate $(setup) : $(version) : $(vendor) ] ; } else { @@ -145,7 +145,7 @@ rule init ( # to it. If path is not found, issues an error. # If there are several possibilities, returns arbitrary one, after issuing a # warning message. -local rule locate ( version ? : vendor ? ) +local rule locate ( setup : version ? : vendor ? ) { local possible-paths ; @@ -196,7 +196,7 @@ local rule locate ( version ? : vendor ? ) possible-paths += [ modules.peek : PATH Path path ] ; # Search now - local setup = [ GLOB $(possible-paths) : vcvars32.bat ] ; + local setup = [ GLOB $(possible-paths) : $(setup) ] ; # Try to avoid reporting ambiguity when there's several occurences # of the same path, probably differing by case. setup = [ unique $(setup:L) ] ;