From fa75fd6cd0011f4c8fe32e8fcb870f244f31c4bc Mon Sep 17 00:00:00 2001 From: Vladimir Prus Date: Sat, 1 Dec 2007 14:56:23 +0000 Subject: [PATCH] Change the detection of 64-bit windows to handle EM64T processors. [SVN r41532] --- v2/tools/msvc.jam | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/v2/tools/msvc.jam b/v2/tools/msvc.jam index 6cb75bdb2..ce95dd4e7 100644 --- a/v2/tools/msvc.jam +++ b/v2/tools/msvc.jam @@ -310,8 +310,16 @@ local rule configure-really ( # and x86_ia64 is right one. setup-option = x86 x86_amd64 x86_ia64 ; - # Use a native x64 compiler if possible + # 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 reflects processor proper, and the second is + # empirically found to be always x86 when using 32-bit + # windows. if [ MATCH ^(AMD64) : [ os.environ PROCESSOR_IDENTIFIER ] ] + || [ MATCH ^(EM64T) : [ os.environ PROCESSOR_IDENTIFIER ] ] { setup-option = x86 amd64 x86_ia64 ; }