From 72ff0b63ff2b875d356713ec5cbc6f3e56d5a1b3 Mon Sep 17 00:00:00 2001
From: Steven Watanabe <steven@providere-consulting.com>
Date: Tue, 1 Mar 2016 10:17:54 -0700
Subject: [PATCH] Fix setup script handling for msvc-7.1. * global-setup
 doesn't exist. * cpu should only be i386.

---
 src/tools/msvc.jam | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/tools/msvc.jam b/src/tools/msvc.jam
index f3561db20..78e64e684 100644
--- a/src/tools/msvc.jam
+++ b/src/tools/msvc.jam
@@ -793,7 +793,7 @@ actions write-setup-script
 # Local helper rule to create the vcvars setup command for given architecture
 # and options.
 #
-local rule generate-setup-cmd ( version : command : parent : options * : cpu : global-setup : default-global-setup-options : default-setup )
+local rule generate-setup-cmd ( version : command : parent : options * : cpu : global-setup ? : default-global-setup-options : default-setup )
 {
     local setup-prefix = "call " ;
     local setup-suffix = " >nul"$(.nl) ;
@@ -960,7 +960,7 @@ local rule configure-really ( version ? : options * )
         {
             cpu = i386 ;
         }
-        if $(below-11.0)
+        else if $(below-11.0)
         {
             cpu = i386 amd64 ia64 ;
         }