[Boost-commit] svn:boost r49692 - trunk/tools/build/v2/tools

Subject: [Boost-commit] svn:boost r49692 - trunk/tools/build/v2/tools
From: ghost_at_[hidden]
Date: 2008-11-12 02:20:19

Author: vladimir_prus
Date: 2008-11-12 02:20:18 EST (Wed, 12 Nov 2008)
New Revision: 49692
URL: http://svn.boost.org/trac/boost/changeset/49692

Log:
Always call setup script before running "mt".  Fix msvc-linking-generator,
by calling the right base method.

Patch from Jeroen van der Wulp.

Text files modified: 
   trunk/tools/build/v2/tools/msvc.jam |    11 ++---------                             
   1 files changed, 2 insertions(+), 9 deletions(-)

Modified: trunk/tools/build/v2/tools/msvc.jam
==============================================================================
--- trunk/tools/build/v2/tools/msvc.jam	(original)
+++ trunk/tools/build/v2/tools/msvc.jam	2008-11-12 02:20:18 EST (Wed, 12 Nov 2008)
@@ -892,14 +892,7 @@
             toolset.flags msvc.compile .IDL $(cpu-conditions) : $(setup-$(c))$(idl-compiler) ;
             toolset.flags msvc.compile .MC  $(cpu-conditions) : $(setup-$(c))$(mc-compiler) ;
 
-            if ! [ os.name ] in NT
-            {
-                toolset.flags msvc.link .MT $(cpu-conditions) : $(setup-$(c))$(manifest-tool) -nologo ;
-            }
-            else
-            {
-                toolset.flags msvc.link .MT $(cpu-conditions) : $(manifest-tool) -nologo ;
-            }
+            toolset.flags msvc.link .MT $(cpu-conditions) : $(setup-$(c))$(manifest-tool) -nologo ;
 
             if $(cc-filter)
             {
@@ -990,7 +983,7 @@
     # whatever.gch.
     rule generated-targets ( sources + : property-set : project name ? )
     {
-        local result = [ generator.generated-targets $(sources)
+        local result = [ linking-generator.generated-targets $(sources)
           : $(property-set) : $(project) $(name) ] ;
         if [ $(property-set).get <embed-manifest> ] = "off"
         {