From: Zachary Ware <zachary.ware@gmail.com>
Date: Sat, 29 Aug 2015 04:52:31 +0000 (-0500)
Subject: Issue #24953: Include ICC version in sys.version string when bulit with ICC on Windows
X-Git-Tag: v2.7.11rc1~192
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=d155d72c1ecaf5d75191bbae04c0664f016cd4a7;p=thirdparty%2FPython%2Fcpython.git

Issue #24953: Include ICC version in sys.version string when bulit with ICC on Windows
---

diff --git a/PC/pyconfig.h b/PC/pyconfig.h
index a49ce6901398..53c8289d60d5 100644
--- a/PC/pyconfig.h
+++ b/PC/pyconfig.h
@@ -148,7 +148,11 @@ WIN32 is still required for the locale module.
 #define COMPILER _Py_PASTE_VERSION("64 bit (Itanium)")
 #define MS_WINI64
 #elif defined(_M_X64) || defined(_M_AMD64)
+#ifdef __INTEL_COMPILER
+#define COMPILER ("[ICC v." _Py_STRINGIZE(__INTEL_COMPILER) " 64 bit (amd64) with MSC v." _Py_STRINGIZE(_MSC_VER) " CRT]")
+#else
 #define COMPILER _Py_PASTE_VERSION("64 bit (AMD64)")
+#endif /* __INTEL_COMPILER */
 #define MS_WINX64
 #else
 #define COMPILER _Py_PASTE_VERSION("64 bit (Unknown)")
@@ -204,7 +208,11 @@ typedef _W64 int ssize_t;
 
 #if defined(MS_WIN32) && !defined(MS_WIN64)
 #ifdef _M_IX86
+#ifdef __INTEL_COMPILER
+#define COMPILER ("[ICC v." _Py_STRINGIZE(__INTEL_COMPILER) " 32 bit (Intel) with MSC v." _Py_STRINGIZE(_MSC_VER) " CRT]")
+#else
 #define COMPILER _Py_PASTE_VERSION("32 bit (Intel)")
+#endif /* __INTEL_COMPILER */
 #else
 #define COMPILER _Py_PASTE_VERSION("32 bit (Unknown)")
 #endif