[Python-checkins] cpython (2.7): Issue #24953: Include ICC version in sys.version string when bulit with ICC on

zach.ware python-checkins at python.org
Sat Aug 29 12:51:26 CEST 2015


https://hg.python.org/cpython/rev/3639520c3fe9
changeset:   97538:3639520c3fe9
branch:      2.7
parent:      97525:514f5d610175
user:        Zachary Ware <zachary.ware at gmail.com>
date:        Fri Aug 28 23:52:31 2015 -0500
summary:
  Issue #24953: Include ICC version in sys.version string when bulit with ICC on Windows

files:
  PC/pyconfig.h |  8 ++++++++
  1 files changed, 8 insertions(+), 0 deletions(-)


diff --git a/PC/pyconfig.h b/PC/pyconfig.h
--- a/PC/pyconfig.h
+++ b/PC/pyconfig.h
@@ -148,7 +148,11 @@
 #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 @@
 
 #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

-- 
Repository URL: https://hg.python.org/cpython


More information about the Python-checkins mailing list