[Boost-commit] svn:boost r41843 - branches/bitten/tools/build/v2/tools

From: dave_at_[hidden]
Date: 2007-12-07 18:25:49

Author: dave
Date: 2007-12-07 18:25:48 EST (Fri, 07 Dec 2007)
New Revision: 41843
URL: http://svn.boost.org/trac/boost/changeset/41843

Log:
Merge 64-bit support from trunk

Text files modified: 
   branches/bitten/tools/build/v2/tools/msvc.jam |    12 ++++++++++--                            
   1 files changed, 10 insertions(+), 2 deletions(-)

Modified: branches/bitten/tools/build/v2/tools/msvc.jam
==============================================================================
--- branches/bitten/tools/build/v2/tools/msvc.jam	(original)
+++ branches/bitten/tools/build/v2/tools/msvc.jam	2007-12-07 18:25:48 EST (Fri, 07 Dec 2007)
@@ -310,8 +310,16 @@
                     # and x86_ia64 is right one.
                     setup-option = x86 x86_amd64 x86_ia64 ;
                     
-                    # Use a native x64 compiler if possible
-                    if [ MATCH ^(AMD64) : [ os.environ PROCESSOR_IDENTIFIER ] ]
+                    # When using 64-bit Windows, and targeting 64-bit,
+                    # it's possible to use native 64-bit compiler, which is
+                    # selected by the "amd64" parameter to vcvarsall.bat.
+                    # There are two variables we can use -- 
+                    # PROCESSOR_ARCHITECTURE and PROCESSOR_IDENTIFIER.
+                    # The first is 'x86' when running 32-bit windows,
+                    # no matter what processor is, and 'AMD64' on 64-bit
+                    # windows on x86 (either AMD64 or EM64T).
+                    # windows.                    
+                    if [ MATCH ^(AMD64) : [ os.environ PROCESSOR_ARCHITECTURE ] ]
                     {
                         setup-option = x86 amd64 x86_ia64 ;
                     }