From 316223805ecbd12fbc20eda00fac98fff4bb8e86 Mon Sep 17 00:00:00 2001
From: Vladimir Prus <ghost@cs.msu.su>
Date: Sun, 17 Sep 2006 18:37:01 +0000
Subject: [PATCH] Merge:\n 	* tools/stage.jam (rename): Generate 'vc6' and
 'vc7' suffixes 	instead of 'vc60' and 'vc70', to match V1 behaviour.

[SVN r35148]
---
 v2/tools/stage.jam | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/v2/tools/stage.jam b/v2/tools/stage.jam
index c775c35ba..18c38f022 100644
--- a/v2/tools/stage.jam
+++ b/v2/tools/stage.jam
@@ -516,6 +516,22 @@ rule rename ( name : type ? : property-set : unversioned ? )
                 case vacpp* : toolset-tag += xlc ;
             }
             local version = [ MATCH "<toolset.*version>([0123456789]+)[.]([0123456789]*)" : $(properties) ] ;
+            # For historical reasons, vc6.0 and vc7.0 use different
+            # naming.
+            if $(toolset-tag) = vc
+            {
+                if $(version[1]) = 6
+                {
+                    # Cancel minor version.
+                    version = 6 ;
+                }
+                else if $(version[1]) = 7 && $(version[2]) = 0
+                {
+                    version = 7 ;
+                }
+            }
+            
+            
             toolset-tag += $(version) ;
         }