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

Subject: [Boost-commit] svn:boost r50384 - trunk/tools/build/v2/tools
From: john_at_[hidden]
Date: 2008-12-24 11:37:12

Author: johnmaddock
Date: 2008-12-24 11:37:12 EST (Wed, 24 Dec 2008)
New Revision: 50384
URL: http://svn.boost.org/trac/boost/changeset/50384

Log:
Fix for Intel-11.0 compiler setup requirements.
Text files modified: 
   trunk/tools/build/v2/tools/intel-win.jam |     7 ++++++-                                 
   1 files changed, 6 insertions(+), 1 deletions(-)

Modified: trunk/tools/build/v2/tools/intel-win.jam
==============================================================================
--- trunk/tools/build/v2/tools/intel-win.jam	(original)
+++ trunk/tools/build/v2/tools/intel-win.jam	2008-12-24 11:37:12 EST (Wed, 24 Dec 2008)
@@ -56,7 +56,11 @@
     }
 
     local setup ;
-    setup = $(root)/iclvars.bat ;
+    setup = [ GLOB $(root) : iclvars_*.bat ] ;
+    if ! $(setup)
+    {
+       setup = $(root)/iclvars.bat ;
+    }
     setup = "call \""$(setup)"\" > nul " ;
 
     if [ os.name ] = NT
@@ -174,3 +178,4 @@
 toolset.flags intel-win.link LIBRARY_OPTION <toolset>intel : "" ;
 
 toolset.flags intel-win YLOPTION ;
+