From e0acf6504356f14a6352b16ffed7b59453914863 Mon Sep 17 00:00:00 2001 From: Shane Kearns Date: Fri, 24 Feb 2012 14:56:44 +0000 Subject: configure - fix detection of MSVC compiler in x64 x86 processes get redirected to the 32 bit area of the registry, while 64 bit processes access the registry in raw form. Added the registry paths for 64 bit processes to see the 32 bit registry keys for MS visual studio. (Wow6432Node) This problem was revealed when we stopped including configure.exe as a binary checkin to git. Running configure in an x64 compiler environment results in creating an x64 configure.exe Change-Id: I5e3e51ddbf20ccc65abf1833bf23ee5670bd973e Reviewed-by: Joerg Bornemann Reviewed-by: Oswald Buddenhagen --- tools/configure/environment.cpp | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'tools/configure') diff --git a/tools/configure/environment.cpp b/tools/configure/environment.cpp index 80542e7697..ae378f6b41 100644 --- a/tools/configure/environment.cpp +++ b/tools/configure/environment.cpp @@ -76,9 +76,13 @@ struct CompilerInfo{ {CC_MINGW, "MinGW (Minimalist GNU for Windows)", 0, "g++.exe"}, {CC_INTEL, "Intel(R) C++ Compiler for 32-bit applications", 0, "icl.exe"}, // xilink.exe, xilink5.exe, xilink6.exe, xilib.exe {CC_NET2003, "Microsoft (R) 32-bit C/C++ Optimizing Compiler.NET 2003 (7.1)", "Software\\Microsoft\\VisualStudio\\7.1\\Setup\\VC\\ProductDir", "cl.exe"}, // link.exe, lib.exe + {CC_NET2003, "Microsoft (R) 32-bit C/C++ Optimizing Compiler.NET 2003 (7.1)", "Software\\Wow6432Node\\Microsoft\\VisualStudio\\7.1\\Setup\\VC\\ProductDir", "cl.exe"}, // link.exe, lib.exe {CC_NET2005, "Microsoft (R) 32-bit C/C++ Optimizing Compiler.NET 2005 (8.0)", "Software\\Microsoft\\VisualStudio\\SxS\\VC7\\8.0", "cl.exe"}, // link.exe, lib.exe + {CC_NET2005, "Microsoft (R) 32-bit C/C++ Optimizing Compiler.NET 2005 (8.0)", "Software\\Wow6432Node\\Microsoft\\VisualStudio\\SxS\\VC7\\8.0", "cl.exe"}, // link.exe, lib.exe {CC_NET2008, "Microsoft (R) 32-bit C/C++ Optimizing Compiler.NET 2008 (9.0)", "Software\\Microsoft\\VisualStudio\\SxS\\VC7\\9.0", "cl.exe"}, // link.exe, lib.exe + {CC_NET2008, "Microsoft (R) 32-bit C/C++ Optimizing Compiler.NET 2008 (9.0)", "Software\\Wow6432Node\\Microsoft\\VisualStudio\\SxS\\VC7\\9.0", "cl.exe"}, // link.exe, lib.exe {CC_NET2010, "Microsoft (R) 32-bit C/C++ Optimizing Compiler.NET 2010 (10.0)", "Software\\Microsoft\\VisualStudio\\SxS\\VC7\\10.0", "cl.exe"}, // link.exe, lib.exe + {CC_NET2010, "Microsoft (R) 32-bit C/C++ Optimizing Compiler.NET 2010 (10.0)", "Software\\Wow6432Node\\Microsoft\\VisualStudio\\SxS\\VC7\\10.0", "cl.exe"}, // link.exe, lib.exe {CC_UNKNOWN, "Unknown", 0, 0}, }; -- cgit v1.2.3